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 43e98fa7d9e1e4639420fa4c78a38a67fbacf191..e81f7412050d51a2cd1d9acb81a1aeb2b72e6835 100644 (file)
--- 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);
 
                        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,
                                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() : ""
                                                );
                                                 agent_supported ? " agent=" : "",
                                                 agent_supported ? git_user_agent_sanitized() : ""
                                                );

-                       }

                        else
                                packet_buf_write(&req_buf, "%s %s %s",
                                                 old_hex, new_hex, ref->name);
                        else
                                packet_buf_write(&req_buf, "%s %s %s",
                                                 old_hex, new_hex, ref->name);