diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:11:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:11:11 -0800 |
| commit | 7b1baed3fbcffbc496a3161c969ba188ac7c6a7d (patch) | |
| tree | 6c0ae00736b9b24cd6804485f5a43ea31650035c /builtin/gc.c | |
| parent | Merge branch 'nd/fsck-progress' (diff) | |
| parent | reachable: per-object progress (diff) | |
| download | tgif-7b1baed3fbcffbc496a3161c969ba188ac7c6a7d.tar.xz | |
Merge branch 'nd/prune-progress'
* nd/prune-progress:
reachable: per-object progress
prune: handle --progress/no-progress
prune: show progress while marking reachable objects
Diffstat (limited to 'builtin/gc.c')
| -rw-r--r-- | builtin/gc.c | 4 |
1 files changed, 3 insertions, 1 deletions
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]); } |