diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-13 12:19:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-13 12:19:19 -0700 |
| commit | 3af459e48dd275665568f3a7a6d76d90c1843e6a (patch) | |
| tree | 7c6dd38b823daf85193e2044a3f696ec9ad3c7fe /builtin/rebase.c | |
| parent | Merge branch 'cb/credential-doc-fixes' (diff) | |
| parent | auto-gc: pass --quiet down from am, commit, merge and rebase (diff) | |
| download | tgif-3af459e48dd275665568f3a7a6d76d90c1843e6a.tar.xz | |
Merge branch 'jc/auto-gc-quiet'
Teach "am", "commit", "merge" and "rebase", when they are run with
the "--quiet" option, to pass "--quiet" down to "gc --auto".
* jc/auto-gc-quiet:
auto-gc: pass --quiet down from am, commit, merge and rebase
auto-gc: extract a reusable helper from "git fetch"
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 ca6aa0dc7a..37ba76ac3d 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -722,7 +722,6 @@ static int rebase_write_basic_state(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); @@ -732,7 +731,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; |