summaryrefslogtreecommitdiff
path: root/fetch-pack.c
diff options
context:
space:
mode:
authorJonathan Tan <jonathantanmy@google.com>2020-04-28 00:01:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-28 16:55:06 (GMT)
commit2f0a093dd640e0dad0b261dae2427f2541b5426c (patch)
treee774748e9d7d3e42f9a47759d9f1ecfdda80b613 /fetch-pack.c
parent4fa3f00abb55c3334cce71e201a5ff2c70f8561f (diff)
downloadgit-2f0a093dd640e0dad0b261dae2427f2541b5426c.zip
git-2f0a093dd640e0dad0b261dae2427f2541b5426c.tar.gz
git-2f0a093dd640e0dad0b261dae2427f2541b5426c.tar.bz2
fetch-pack: in protocol v2, reset in_vain upon ACK
In the function process_acks() in fetch-pack.c, the variable received_ack is meant to track that an ACK was received, but it was never set. This results in negotiation terminating prematurely through the in_vain counter, when the counter should have been reset upon every ACK. Therefore, reset the in_vain counter upon every ACK. Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fetch-pack.c')
-rw-r--r--fetch-pack.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fetch-pack.c b/fetch-pack.c
index 3891f8b..10314df 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1307,6 +1307,7 @@ static enum common_found process_acks(struct fetch_negotiator *negotiator,
if (skip_prefix(reader->line, "ACK ", &arg)) {
struct object_id oid;
+ received_ack = 1;
if (!get_oid_hex(arg, &oid)) {
struct commit *commit;
oidset_insert(common, &oid);