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/merge.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/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 923e32acf1..ca6a5dc4bf 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -450,7 +450,6 @@ static void finish(struct commit *head_commit, if (verbosity >= 0 && !merge_msg.len) printf(_("No merge message -- not updating HEAD\n")); else { - const char *argv_gc_auto[] = { "gc", "--auto", NULL }; update_ref(reflog_message.buf, "HEAD", new_head, head, 0, UPDATE_REFS_DIE_ON_ERR); /* @@ -458,7 +457,7 @@ static void finish(struct commit *head_commit, * user should see them. */ close_object_store(the_repository->objects); - run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); + run_auto_gc(verbosity < 0); } } if (new_head && show_diffstat) { |