diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-06 11:06:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-06 11:10:41 -0700 |
| commit | 5a277f3ff7cb57e35ce574e93866b6c7e3bf8971 (patch) | |
| tree | e93c73328b69b31ef426b1985c0ab825376141ca /builtin/send-pack.c | |
| parent | b15b5b10a75e202f3f90e000925545243267cbee (diff) | |
| download | git-5a277f3ff7cb57e35ce574e93866b6c7e3bf8971.tar.gz | |
Revert "Merge branch 'cb/maint-quiet-push' into maint"
This reverts commit ffa69e61d3c5730bd4b65a465efc130b0ef3c7df, reversing
changes made to 4a13c4d14841343d7caad6ed41a152fee550261d.
Adding a new command line option to receive-pack and feed it from
send-pack is not an acceptable way to add features, as there is no
guarantee that your updated send-pack will be talking to updated
receive-pack. New features need to be added via the capability mechanism
negotiated over the protocol.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/send-pack.c')
| -rw-r--r-- | builtin/send-pack.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 40a1675997..c1f6ddd927 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -439,10 +439,6 @@ 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; @@ -492,13 +488,8 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) fd[0] = 0; fd[1] = 1; } else { - struct strbuf sb = STRBUF_INIT; - strbuf_addstr(&sb, receivepack); - if (args.quiet) - strbuf_addstr(&sb, " --quiet"); - conn = git_connect(fd, dest, sb.buf, + conn = git_connect(fd, dest, receivepack, args.verbose ? CONNECT_VERBOSE : 0); - strbuf_release(&sb); } memset(&extra_have, 0, sizeof(extra_have)); |