git-gc: pass --progress down to git-repack

Author: oleganza

Documentation/git-gc.txt

@@ -9,7 +9,7 @@ git-gc - Cleanup unnecessary files and optimize the local repository
 SYNOPSIS
 --------
 [verse]
-'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune]
+'git gc' [--aggressive] [--auto] [--quiet] [--progress] [--prune=<date> | --no-prune]
 
 DESCRIPTION
 -----------
@@ -69,7 +69,14 @@ automatic consolidation of packs.
 	Do not prune any loose objects.
 
 --quiet::
-	Suppress all progress reports.
+	Suppress all progress reports. Progress is not reported to
+	the standard error stream.
+
+--progress::
+	Progress status is reported on the standard error stream
+	by default when it is attached to a terminal, unless -q
+	is specified. This flag forces progress status even if the
+	standard error stream is not directed to a terminal.
 
 Configuration
 -------------

builtin/gc.c

@@ -28,7 +28,7 @@ static int gc_auto_threshold = 6700;
 static int gc_auto_pack_limit = 50;
 static const char *prune_expire = "2.weeks.ago";
 
-#define MAX_ADD 10
+#define MAX_ADD 11
 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", "-d", "-l", NULL};
@@ -177,10 +177,12 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 	int aggressive = 0;
 	int auto_gc = 0;
 	int quiet = 0;
+	int progress = 0;
 	char buf[80];
 
 	struct option builtin_gc_options[] = {
 		OPT__QUIET(&quiet, "suppress progress reporting"),
+		OPT_BOOLEAN(0, "progress", &progress, "force progress reporting"),
 		{ OPTION_STRING, 0, "prune", &prune_expire, "date",
 			"prune unreferenced objects",
 			PARSE_OPT_OPTARG, NULL, (intptr_t)prune_expire },
@@ -213,6 +215,9 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 	if (quiet)
 		append_option(argv_repack, "-q", MAX_ADD);
 
+	if (progress)
+		append_option(argv_repack, "--progress", MAX_ADD);
+
 	if (auto_gc) {
 		/*
 		 * Auto-gc should be least intrusive as possible.

contrib/examples/git-gc.sh

@@ -9,12 +9,16 @@ SUBDIRECTORY_OK=Yes
 . git-sh-setup
 
 no_prune=:
+progress=
 while test $# != 0
 do
 	case "$1" in
 	--prune)
 		no_prune=
 		;;
+	--progress)
+		progress=--progress
+		;;
 	--)
 		usage
 		;;
@@ -32,6 +36,6 @@ esac
 test "true" != "$pack_refs" ||
 git pack-refs --prune &&
 git reflog expire --all &&
-git-repack -a -d -l &&
+git-repack -a -d -l $progress &&
 $no_prune git prune &&
 git rerere gc || exit