From bf0a59b3872211eaa6d4cebb23ae110522458625 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 8 Nov 2011 00:34:08 -0500 Subject: prune: handle --progress/no-progress And have "git gc" pass no-progress when quiet. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- builtin/gc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'builtin/gc.c') diff --git a/builtin/gc.c b/builtin/gc.c index 0498094711..271376d82b 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -32,7 +32,7 @@ static const char *prune_expire = "2.weeks.ago"; 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}; -static const char *argv_prune[] = {"prune", "--expire", NULL, NULL}; +static const char *argv_prune[] = {"prune", "--expire", NULL, NULL, NULL}; static const char *argv_rerere[] = {"rerere", "gc", NULL}; static int gc_config(const char *var, const char *value, void *cb) @@ -243,6 +243,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix) if (prune_expire) { argv_prune[2] = prune_expire; + if (quiet) + argv_prune[3] = "--no-progress"; if (run_command_v_opt(argv_prune, RUN_GIT_CMD)) return error(FAILED_RUN, argv_prune[0]); } -- cgit v1.2.3