gc: remove redundant check for gc_auto_threshold
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Wed, 13 Mar 2019 23:54:35 +0000 (00:54 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Mar 2019 04:55:28 +0000 (13:55 +0900)
Checking gc_auto_threshold in too_many_loose_objects() was added in
17815501a8 ("git-gc --auto: run "repack -A -d -l" as necessary.",
2007-09-17) when need_to_gc() itself was also reliant on
gc_auto_pack_limit before its early return:

gc_auto_threshold <= 0 && gc_auto_pack_limit <= 0

When that check was simplified to just checking "gc_auto_threshold <=
0" in b14d255ba8 ("builtin-gc.c: allow disabling all auto-gc'ing by
assigning 0 to gc.auto", 2008-03-19) this unreachable code should have
been removed. We only call too_many_loose_objects() from within
need_to_gc() itself, which will return if this condition holds, and in
cmd_gc() which will return before ever getting to "auto_gc &&
too_many_loose_objects()" if "auto_gc && !need_to_gc()" is true
earlier in the function.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/gc.c
index 020f725acc40f413c49f812ea0e6aac0153d097c..8c2312681ceb95320aaf03b5876bd110a9e0134a 100644 (file)
@@ -157,9 +157,6 @@ static int too_many_loose_objects(void)
        int num_loose = 0;
        int needed = 0;
 
-       if (gc_auto_threshold <= 0)
-               return 0;
-
        dir = opendir(git_path("objects/17"));
        if (!dir)
                return 0;