mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/gc-keep-base-option'

Browse Source 
Fix an option name in "gc" documentation.

* ab/gc-keep-base-option:
  gc: rename keep_base_pack variable for --keep-largest-pack
  gc docs: change --keep-base-pack to --keep-largest-pack
This commit is contained in:
Junio C Hamano
2020-11-30 14:49:42 -08:00
parent 124250108f 793c1464d3
commit 1c04cdd424
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/config/gc.txt
View File

@ -44,9 +44,9 @@ gc.autoDetach::
gc.bigPackThreshold:: gc.bigPackThreshold::
If non-zero, all packs larger than this limit are kept when If non-zero, all packs larger than this limit are kept when
`git gc` is run. This is very similar to `--keep-base-pack` `git gc` is run. This is very similar to `--keep-largest-pack`
except that all packs that meet the threshold are kept, not except that all packs that meet the threshold are kept, not
just the base pack. Defaults to zero. Common unit suffixes of just the largest pack. Defaults to zero. Common unit suffixes of
'k', 'm', or 'g' are supported. 'k', 'm', or 'g' are supported.
+ +
Note that if the number of kept packs is more than gc.autoPackLimit, Note that if the number of kept packs is more than gc.autoPackLimit,
@ -57,7 +57,7 @@ gc.autoPackLimit and gc.bigPackThreshold should be respected again.
If the amount of memory estimated for `git repack` to run smoothly is If the amount of memory estimated for `git repack` to run smoothly is
not available and `gc.bigPackThreshold` is not set, the largest pack not available and `gc.bigPackThreshold` is not set, the largest pack
will also be excluded (this is the equivalent of running `git gc` with will also be excluded (this is the equivalent of running `git gc` with
`--keep-base-pack`). `--keep-largest-pack`).
gc.writeCommitGraph:: gc.writeCommitGraph::
If true, then gc will rewrite the commit-graph file when If true, then gc will rewrite the commit-graph file when

8
builtin/gc.c
View File

@ -534,7 +534,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
const char *name; const char *name;
pid_t pid; pid_t pid;
int daemonized = 0; int daemonized = 0;
int keep_base_pack = -1; int keep_largest_pack = -1;
timestamp_t dummy; timestamp_t dummy;
struct option builtin_gc_options[] = { struct option builtin_gc_options[] = {
@ -548,7 +548,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
OPT_BOOL_F(0, "force", &force, OPT_BOOL_F(0, "force", &force,
N_("force running gc even if there may be another gc running"), N_("force running gc even if there may be another gc running"),
PARSE_OPT_NOCOMPLETE), PARSE_OPT_NOCOMPLETE),
OPT_BOOL(0, "keep-largest-pack", &keep_base_pack, OPT_BOOL(0, "keep-largest-pack", &keep_largest_pack,
N_("repack all other packs except the largest pack")), N_("repack all other packs except the largest pack")),
OPT_END() OPT_END()
}; };
@ -625,8 +625,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
} else { } else {
struct string_list keep_pack = STRING_LIST_INIT_NODUP; struct string_list keep_pack = STRING_LIST_INIT_NODUP;
if (keep_base_pack != -1) { if (keep_largest_pack != -1) {
if (keep_base_pack) if (keep_largest_pack)
find_base_packs(&keep_pack, 0); find_base_packs(&keep_pack, 0);
} else if (big_pack_threshold) { } else if (big_pack_threshold) {
find_base_packs(&keep_pack, big_pack_threshold); find_base_packs(&keep_pack, big_pack_threshold);