[PATCH v2 07/19] send-pack: always send capabilities
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 22, 2014, 20:30 UTC
- Message-ID
- <1408739424-31429-8-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1408739424-31429-1-git-send-email-gitster@pobox.com>
We tried to avoid sending one extra byte, NUL and nothing behind it to signal there is no protocol capabilities being sent, on the first command packet on the wire, but it just made the code look ugly.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- send-pack.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/send-pack.c b/send-pack.c index f3c5ebe..2fa6c34 100644 --- a/send-pack.c +++ b/send-pack.c @@ -281,8 +281,7 @@ int send_pack(struct send_pack_args *args, char *new_hex = sha1_to_hex(ref->new_sha1); int quiet = quiet_supported && (args->quiet || !args->progress); - if (!cmds_sent && (status_report || use_sideband || - quiet || agent_supported)) { + if (!cmds_sent) packet_buf_write(&req_buf, "%s %s %s%c%s%s%s%s%s", old_hex, new_hex, ref->name, 0, @@ -292,7 +291,6 @@ int send_pack(struct send_pack_args *args, agent_supported ? " agent=" : "", agent_supported ? git_user_agent_sanitized() : "" ); - } else packet_buf_write(&req_buf, "%s %s %s", old_hex, new_hex, ref->name);
-- 2.1.0-304-g950f846