summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-08-15 18:30:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-15 20:23:19 (GMT)
commit64de20a1265b676f9cc0e5f46379a017560fa333 (patch)
tree44375066c0cbc1f2f98a43966cd4b4afe8ef2b84
parente40671a3d9115f2c0cea614d8b5d265150f44c24 (diff)
downloadgit-64de20a1265b676f9cc0e5f46379a017560fa333.zip
git-64de20a1265b676f9cc0e5f46379a017560fa333.tar.gz
git-64de20a1265b676f9cc0e5f46379a017560fa333.tar.bz2
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>
-rw-r--r--send-pack.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/send-pack.c b/send-pack.c
index 43e98fa..e81f741 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);