diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-08-17 17:26:05 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-17 17:26:05 -0700 |
commit | 6dd5622f68157f471c4f784e8c41f39e8c5163fc (patch) | |
tree | 0ec2b265ea60b53afbc0ec52fe61fa2476b4dbfa /remote-curl.c | |
parent | 660578d4da9d71fbc1e553c95d18987b40af5f0f (diff) | |
parent | 0d086b8e33820d7cf87386a912e2939c59822f35 (diff) | |
download | git-6dd5622f68157f471c4f784e8c41f39e8c5163fc.tar.gz |
Merge branch 'cb/maint-quiet-push'
* 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 b8cf45a7dd..5798aa57b6 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++) |