summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-05-06 20:18:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-05-07 19:24:35 (GMT)
commit7c3e9e8cfbf6a8e45f4745049dc58f5c9e9d1eb9 (patch)
tree7ef59d5576f2e737e04a951af58ab06545a83cb3 /builtin/am.c
parent850b6edefa7a4fcc75149447cb8a984f804dd080 (diff)
downloadgit-7c3e9e8cfbf6a8e45f4745049dc58f5c9e9d1eb9.zip
git-7c3e9e8cfbf6a8e45f4745049dc58f5c9e9d1eb9.tar.gz
git-7c3e9e8cfbf6a8e45f4745049dc58f5c9e9d1eb9.tar.bz2
auto-gc: pass --quiet down from am, commit, merge and rebase
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>
Diffstat (limited to 'builtin/am.c')
-rw-r--r--builtin/am.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c
index e3dfd93..69e50de 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1691,7 +1691,6 @@ static int do_interactive(struct am_state *state)
*/
static void am_run(struct am_state *state, int resume)
{
- const char *argv_gc_auto[] = {"gc", "--auto", NULL};
struct strbuf sb = STRBUF_INIT;
unlink(am_path(state, "dirtyindex"));
@@ -1796,7 +1795,7 @@ next:
if (!state->rebasing) {
am_destroy(state);
close_object_store(the_repository->objects);
- run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
+ run_auto_gc(state->quiet);
}
}