]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/auto-gc-quiet'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 May 2020 19:19:19 +0000 (12:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 May 2020 19:19:19 +0000 (12:19 -0700)
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"

1  2 
builtin/commit.c
builtin/fetch.c
builtin/merge.c
builtin/rebase.c
run-command.c

index a73de0a4c529f658c04e6a2a453b93c1c70718c8,fa8eca623ee9c0a0881f2a9597b032a620c73b2e..d1b7396052a2449f3ebda88df62cf7b89499090f
@@@ -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);
diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/merge.c
Simple merge
Simple merge
diff --cc run-command.c
Simple merge