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 /builtin/send-pack.c | |
| parent | 660578d4da9d71fbc1e553c95d18987b40af5f0f (diff) | |
| parent | 0d086b8e33820d7cf87386a912e2939c59822f35 (diff) | |
| download | git-6dd5622f68157f471c4f784e8c41f39e8c5163fc.tar.gz git-6dd5622f68157f471c4f784e8c41f39e8c5163fc.tar.xz | |
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 'builtin/send-pack.c')
| -rw-r--r-- | builtin/send-pack.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index c1f6ddd92..40a167599 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -439,6 +439,10 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) args.force_update = 1; continue; } + if (!strcmp(arg, "--quiet")) { + args.quiet = 1; + continue; + } if (!strcmp(arg, "--verbose")) { args.verbose = 1; continue; @@ -488,8 +492,13 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) fd[0] = 0; fd[1] = 1; } else { - conn = git_connect(fd, dest, receivepack, + struct strbuf sb = STRBUF_INIT; + strbuf_addstr(&sb, receivepack); + if (args.quiet) + strbuf_addstr(&sb, " --quiet"); + conn = git_connect(fd, dest, sb.buf, args.verbose ? CONNECT_VERBOSE : 0); + strbuf_release(&sb); } memset(&extra_have, 0, sizeof(extra_have)); |