diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:12 -0700 |
| commit | 08fd8a055cd11291020bf8c6f83d27cdc55df419 (patch) | |
| tree | 2ac1c3b4efbb537398e4d10a0235d1f62d09c9a8 | |
| parent | Merge branch 'jk/prune-top-level-refs-after-packing' into maint (diff) | |
| parent | fetch: silence git-gc if --quiet is given (diff) | |
| download | git-08fd8a055cd11291020bf8c6f83d27cdc55df419.tar.gz git-08fd8a055cd11291020bf8c6f83d27cdc55df419.zip | |
Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' into maint
* nd/fetch-pass-quiet-to-gc-child-process:
fetch: silence git-gc if --quiet is given
fetch: convert argv_gc_auto to struct argv_array
| -rw-r--r-- | builtin/fetch.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index e8d0cca3e4..159fb7e916 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1110,9 +1110,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) struct string_list list = STRING_LIST_INIT_NODUP; struct remote *remote; int result = 0; - static const char *argv_gc_auto[] = { - "gc", "--auto", NULL, - }; + struct argv_array argv_gc_auto = ARGV_ARRAY_INIT; packet_trace_identity("fetch"); @@ -1198,7 +1196,11 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) list.strdup_strings = 1; string_list_clear(&list, 0); - run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); + argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL); + if (verbosity < 0) + argv_array_push(&argv_gc_auto, "--quiet"); + run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD); + argv_array_clear(&argv_gc_auto); return result; } |