From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 18:47:36 +0000 (-0700)
Subject: Merge branch 'nd/daemonize-gc' into maint
X-Git-Tag: v2.0.1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94c734a60726c78048e0a7b136df88f1c9dc1d60;p=thirdparty%2Fgit.git

Merge branch 'nd/daemonize-gc' into maint

"git gc --auto" was recently changed to run in the background to
give control back early to the end-user sitting in front of the
terminal, but it forgot that housekeeping involving reflogs should
be done without other processes competing for accesses to the refs.

* nd/daemonize-gc:
  gc --auto: do not lock refs in the background
---

94c734a60726c78048e0a7b136df88f1c9dc1d60
diff --cc builtin/gc.c
index 85f5c2bc62,4588af70df..8d219d8c42
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@@ -26,7 -26,7 +26,8 @@@ static const char * const builtin_gc_us
  };
  
  static int pack_refs = 1;
+ static int prune_reflogs = 1;
 +static int aggressive_depth = 250;
  static int aggressive_window = 250;
  static int gc_auto_threshold = 6700;
  static int gc_auto_pack_limit = 50;