gc: rename keep_base_pack variable for --keep-largest-pack
As noted in an earlier change the keep_base_pack variable name is a relic from an earlier on-list version of ae4e89e549 ("gc: add --keep-largest-pack option", 2018-04-15) before it was renamed to --keep-largest-pack. Let's change the variable name to avoid that confusion, it's easier to read the code if there's a 1=1 mapping between the variable name and option name. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Nov 20, 2020 at 12:55 UTC
793c1464d3ee6932bf48f32b4d0a9c8c2efc504f
1 file changed
+4
-4
builtin/gc.c
+4
-4
@@ -530,7 +530,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
530
const char *name;
531
pid_t pid;
532
int daemonized = 0;
533
- int keep_base_pack = -1;
533
+ int keep_largest_pack = -1;
534
timestamp_t dummy;
535
536
struct option builtin_gc_options[] = {
@@ -544,7 +544,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
544
OPT_BOOL_F(0, "force", &force,
545
N_("force running gc even if there may be another gc running"),
546
PARSE_OPT_NOCOMPLETE),
547
- OPT_BOOL(0, "keep-largest-pack", &keep_base_pack,
547
+ OPT_BOOL(0, "keep-largest-pack", &keep_largest_pack,
548
N_("repack all other packs except the largest pack")),
549
OPT_END()
550
};
@@ -621,8 +621,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
621
} else {
622
struct string_list keep_pack = STRING_LIST_INIT_NODUP;
623
624
- if (keep_base_pack != -1) {
625
- if (keep_base_pack)
624
+ if (keep_largest_pack != -1) {
625
+ if (keep_largest_pack)
626
find_base_packs(&keep_pack, 0);
627
} else if (big_pack_threshold) {
628
find_base_packs(&keep_pack, big_pack_threshold);