Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/builtin-gc.c b/builtin-gc.c
index 8ea165aef11a783bcd7891ed18519a19a8e76cb1..939748261041049f31d62935ec08f062bdfa6e79 100644 (file)
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -10,6 +10,7 @@
  * Copyright (c) 2006 Shawn O. Pearce
  */
 
+#include "builtin.h"
 #include "cache.h"
 #include "run-command.h"
 
@@ -17,11 +18,11 @@
 
 static const char builtin_gc_usage[] = "git-gc [--prune] [--aggressive]";
 
-static int pack_refs = -1;
+static int pack_refs = 1;
 static int aggressive_window = -1;
 
 #define MAX_ADD 10
-static const char *argv_pack_refs[] = {"pack-refs", "--prune", NULL};
+static const char *argv_pack_refs[] = {"pack-refs", "--all", "--prune", NULL};
 static const char *argv_reflog[] = {"reflog", "expire", "--all", NULL};
 static const char *argv_repack[MAX_ADD] = {"repack", "-a", "-d", "-l", NULL};
 static const char *argv_prune[] = {"prune", NULL};