diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-08-23 15:19:45 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-23 15:19:45 -0700 |
commit | ffa69e61d3c5730bd4b65a465efc130b0ef3c7df (patch) | |
tree | cb407630cecb82890077897c58e9595c73080b03 /remote-curl.c | |
parent | 4a13c4d14841343d7caad6ed41a152fee550261d (diff) | |
parent | 0d086b8e33820d7cf87386a912e2939c59822f35 (diff) | |
download | git-ffa69e61d3c5730bd4b65a465efc130b0ef3c7df.tar.gz |
Merge branch 'cb/maint-quiet-push' into maint
* cb/maint-quiet-push:
receive-pack: do not overstep command line argument array
propagate --quiet to send-pack/receive-pack
Conflicts:
Documentation/git-receive-pack.txt
Documentation/git-send-pack.txt
Diffstat (limited to 'remote-curl.c')
-rw-r--r-- | remote-curl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/remote-curl.c b/remote-curl.c index 69831e931a..6d3aff62da 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -762,7 +762,9 @@ static int push_git(struct discovery *heads, int nr_spec, char **specs) argv[argc++] = "--thin"; if (options.dry_run) argv[argc++] = "--dry-run"; - if (options.verbosity > 1) + if (options.verbosity < 0) + argv[argc++] = "--quiet"; + else if (options.verbosity > 1) argv[argc++] = "--verbose"; argv[argc++] = url; for (i = 0; i < nr_spec; i++) |