Skip to content

Commit ca8e127

Browse files
peffgitster
authored andcommitted
send-pack: fix capability-sending logic
If we have capabilities to send to the server, we send the regular "want" line followed by a NUL, then the capabilities; otherwise, we do not even send the NUL. However, when checking whether we want to send the "quiet" capability, we check args->quiet, which is wrong. That flag only tells us whether the client side wanted to be quiet, not whether the server supports it (originally, in c207e34, it meant both; however, that was later split into two flags by 01fdc21). We still check the right flag when actually printing "quiet", so this could only have two effects: 1. We might send the trailing NUL when we do not otherwise need to. In theory, an antique pre-capability implementation of git might choke on this (since the client is instructed never to respond with capabilities that the server has not first advertised). 2. We might also want to send the quiet flag if the args->progress flag is false, but this code path would not trigger in that instance. In practice, it almost certainly never matters. The report-status capability dates back to 2005. Any real-world server is going to advertise that, and we will always respond with at least that capability. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ff5effd commit ca8e127

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/send-pack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ int send_pack(struct send_pack_args *args,
306306
char *new_hex = sha1_to_hex(ref->new_sha1);
307307
int quiet = quiet_supported && (args->quiet || !args->progress);
308308

309-
if (!cmds_sent && (status_report || use_sideband || args->quiet)) {
309+
if (!cmds_sent && (status_report || use_sideband || quiet)) {
310310
packet_buf_write(&req_buf,
311311
"%s %s %s%c%s%s%s agent=%s",
312312
old_hex, new_hex, ref->name, 0,

0 commit comments

Comments
 (0)