From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Aug 2014 18:30:36 +0000 (-0700)
Subject: send-pack: always send capabilities
X-Git-Tag: v2.2.0-rc0~64^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64de20a1265b676f9cc0e5f46379a017560fa333;p=thirdparty%2Fgit.git

send-pack: always send capabilities

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>
---

diff --git a/send-pack.c b/send-pack.c
index 43e98fa7d9..e81f741205 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);