From: Junio C Hamano Date: Wed, 13 May 2020 19:19:19 +0000 (-0700) Subject: Merge branch 'jc/auto-gc-quiet' X-Git-Tag: v2.27.0-rc0~19 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3af459e48dd275665568f3a7a6d76d90c1843e6a;p=thirdparty%2Fgit.git 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" --- 3af459e48dd275665568f3a7a6d76d90c1843e6a diff --cc builtin/commit.c index a73de0a4c5,fa8eca623e..d1b7396052 --- a/builtin/commit.c +++ b/builtin/commit.c @@@ -1700,10 -1691,12 +1699,10 @@@ int cmd_commit(int argc, const char **a "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover.")); - if (git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) && - write_commit_graph_reachable(the_repository->objects->odb, 0, NULL)) - return 1; + git_test_write_commit_graph_or_die(); repo_rerere(the_repository, 0); - run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); + run_auto_gc(quiet); run_commit_hook(use_editor, get_index_file(), "post-commit", NULL); if (amend && !no_post_rewrite) { commit_post_rewrite(the_repository, current_head, &oid);