Skip to content

Commit

Permalink
gc: remove redundant check for gc_auto_threshold
Browse files Browse the repository at this point in the history
Checking gc_auto_threshold in too_many_loose_objects() was added in
1781550 ("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 b14d255 ("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>
  • Loading branch information
avar authored and gitster committed Mar 14, 2019
1 parent e902e9b commit 8bf1444
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions builtin/gc.c
Expand Up @@ -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;
Expand Down

0 comments on commit 8bf1444

Please sign in to comment.