diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-06 23:18:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-07 22:24:35 +0300 |
| commit | 7c3e9e8cfbf6a8e45f4745049dc58f5c9e9d1eb9 (patch) | |
| tree | 7ef59d5576f2e737e04a951af58ab06545a83cb3 /builtin/rebase.c | |
| parent | 850b6edefa7a4fcc75149447cb8a984f804dd080 (diff) | |
auto-gc: pass --quiet down from am, commit, merge and rebase
These commands take the --quiet option for their own operation, but
they forget to pass the option down when they invoke "git gc --auto"
internally.
Teach them to do so using the run_auto_gc() helper we added in the
previous step.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index bff53d5d167..fe1a9aba456 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -763,7 +763,6 @@ static int apply_autostash(struct rebase_options *opts) static int finish_rebase(struct rebase_options *opts) { struct strbuf dir = STRBUF_INIT; - const char *argv_gc_auto[] = { "gc", "--auto", NULL }; int ret = 0; delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF); @@ -773,7 +772,7 @@ static int finish_rebase(struct rebase_options *opts) * We ignore errors in 'gc --auto', since the * user should see them. */ - run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); + run_auto_gc(!(opts->flags & (REBASE_NO_QUIET|REBASE_VERBOSE))); if (opts->type == REBASE_MERGE) { struct replay_opts replay = REPLAY_OPTS_INIT; |