mirror of
https://github.com/git/git
synced 2024-08-27 03:29:21 +00:00
Merge branch 'nd/fetch-pass-quiet-to-gc-child-process'
Progress output from "git gc --auto" was visible in "git fetch -q". * 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
This commit is contained in:
commit
08ad26a63d
|
@ -1110,9 +1110,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
|
||||||
struct string_list list = STRING_LIST_INIT_NODUP;
|
struct string_list list = STRING_LIST_INIT_NODUP;
|
||||||
struct remote *remote;
|
struct remote *remote;
|
||||||
int result = 0;
|
int result = 0;
|
||||||
static const char *argv_gc_auto[] = {
|
struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
|
||||||
"gc", "--auto", NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
packet_trace_identity("fetch");
|
packet_trace_identity("fetch");
|
||||||
|
|
||||||
|
@ -1198,7 +1196,11 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
|
||||||
list.strdup_strings = 1;
|
list.strdup_strings = 1;
|
||||||
string_list_clear(&list, 0);
|
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;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue