diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-01 01:49:42 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-01 01:49:43 +0300 |
| commit | 1c04cdd424b8310fceb179144dac8e829205d807 (patch) | |
| tree | dc8b8ba1f72fe18d4a76b1af5e2f466532aca1b0 /builtin/gc.c | |
| parent | 124250108f2495b3fbb821714e8899be93db90b3 (diff) | |
| parent | 793c1464d3ee6932bf48f32b4d0a9c8c2efc504f (diff) | |
Merge branch 'ab/gc-keep-base-option'
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
Diffstat (limited to 'builtin/gc.c')
| -rw-r--r-- | builtin/gc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index bc25ad52c7..3e8d76fd5a 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -534,7 +534,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix) const char *name; pid_t pid; int daemonized = 0; - int keep_base_pack = -1; + int keep_largest_pack = -1; timestamp_t dummy; 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, N_("force running gc even if there may be another gc running"), 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")), OPT_END() }; @@ -625,8 +625,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix) } else { struct string_list keep_pack = STRING_LIST_INIT_NODUP; - if (keep_base_pack != -1) { - if (keep_base_pack) + if (keep_largest_pack != -1) { + if (keep_largest_pack) find_base_packs(&keep_pack, 0); } else if (big_pack_threshold) { find_base_packs(&keep_pack, big_pack_threshold); |