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 /transport.c | |
| parent | b15b5b10a75e202f3f90e000925545243267cbee (diff) | |
| download | git-5a277f3ff7cb57e35ce574e93866b6c7e3bf8971.tar.gz git-5a277f3ff7cb57e35ce574e93866b6c7e3bf8971.tar.xz | |
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 'transport.c')
| -rw-r--r-- | transport.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/transport.c b/transport.c index 98c577804..c9c8056f9 100644 --- a/transport.c +++ b/transport.c @@ -482,18 +482,14 @@ static int set_git_option(struct git_transport_options *opts, static int connect_setup(struct transport *transport, int for_push, int verbose) { struct git_transport_data *data = transport->data; - struct strbuf sb = STRBUF_INIT; if (data->conn) return 0; - strbuf_addstr(&sb, for_push ? data->options.receivepack : - data->options.uploadpack); - if (for_push && transport->verbose < 0) - strbuf_addstr(&sb, " --quiet"); - data->conn = git_connect(data->fd, transport->url, sb.buf, + data->conn = git_connect(data->fd, transport->url, + for_push ? data->options.receivepack : + data->options.uploadpack, verbose ? CONNECT_VERBOSE : 0); - strbuf_release(&sb); return 0; } |