undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto-gc: pass --quiet down from am, commit, merge and rebase

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2020-05-06 13:18:30 -07:00
parent 850b6edefa
commit 7c3e9e8cfb
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/am.c
View File

@ -1691,7 +1691,6 @@ static int do_interactive(struct am_state *state)
*/ */
static void am_run(struct am_state *state, int resume) static void am_run(struct am_state *state, int resume)
{ {
const char *argv_gc_auto[] = {"gc", "--auto", NULL};
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
unlink(am_path(state, "dirtyindex")); unlink(am_path(state, "dirtyindex"));
@ -1796,7 +1795,7 @@ next:
if (!state->rebasing) { if (!state->rebasing) {
am_destroy(state); am_destroy(state);
close_object_store(the_repository->objects); close_object_store(the_repository->objects);
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); run_auto_gc(state->quiet);
} }
} }

3
builtin/commit.c
View File

@ -1488,7 +1488,6 @@ static int git_commit_config(const char *k, const char *v, void *cb)
int cmd_commit(int argc, const char **argv, const char *prefix) int cmd_commit(int argc, const char **argv, const char *prefix)
{ {
const char *argv_gc_auto[] = {"gc", "--auto", NULL};
static struct wt_status s; static struct wt_status s;
static struct option builtin_commit_options[] = { static struct option builtin_commit_options[] = {
OPT__QUIET(&quiet, N_("suppress summary after successful commit")), OPT__QUIET(&quiet, N_("suppress summary after successful commit")),
@ -1697,7 +1696,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
return 1; return 1;
repo_rerere(the_repository, 0); 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); run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
if (amend && !no_post_rewrite) { if (amend && !no_post_rewrite) {
commit_post_rewrite(the_repository, current_head, &oid); commit_post_rewrite(the_repository, current_head, &oid);

3
builtin/merge.c
View File

@ -447,7 +447,6 @@ static void finish(struct commit *head_commit,
if (verbosity >= 0 && !merge_msg.len) if (verbosity >= 0 && !merge_msg.len)
printf(_("No merge message -- not updating HEAD\n")); printf(_("No merge message -- not updating HEAD\n"));
else { else {
const char *argv_gc_auto[] = { "gc", "--auto", NULL };
update_ref(reflog_message.buf, "HEAD", new_head, head, update_ref(reflog_message.buf, "HEAD", new_head, head,
0, UPDATE_REFS_DIE_ON_ERR); 0, UPDATE_REFS_DIE_ON_ERR);
/* /*
@ -455,7 +454,7 @@ static void finish(struct commit *head_commit,
* user should see them. * user should see them.
*/ */
close_object_store(the_repository->objects); 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) { if (new_head && show_diffstat) {

3
builtin/rebase.c
View File

@ -763,7 +763,6 @@ static int apply_autostash(struct rebase_options *opts)
static int finish_rebase(struct rebase_options *opts) static int finish_rebase(struct rebase_options *opts)
{ {
struct strbuf dir = STRBUF_INIT; struct strbuf dir = STRBUF_INIT;
const char *argv_gc_auto[] = { "gc", "--auto", NULL };
int ret = 0; int ret = 0;
delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF); 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 * We ignore errors in 'gc --auto', since the
* user should see them. * 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) { if (opts->type == REBASE_MERGE) {
struct replay_opts replay = REPLAY_OPTS_INIT; struct replay_opts replay = REPLAY_OPTS_INIT;