3a8bbca3df
OBS-URL: https://build.opensuse.org/request/show/798758 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=249
86 lines
2.5 KiB
Diff
86 lines
2.5 KiB
Diff
From 2531a904f87afcf813757bcaad303a463812f6cb Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Tan <jonathantanmy@google.com>
|
|
Date: Mon, 27 Apr 2020 17:01:08 -0700
|
|
Subject: [PATCH] fetch-pack: return enum from process_acks()
|
|
|
|
References: bsc#1170741
|
|
Upstream: queued - expected 2.26.3
|
|
|
|
process_acks() returns 0, 1, or 2, depending on whether "ready" was
|
|
received and if not, whether at least one commit was found to be common.
|
|
Replace these magic numbers with a documented enum.
|
|
|
|
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
---
|
|
fetch-pack.c | 35 ++++++++++++++++++++++++++++-------
|
|
1 file changed, 28 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/fetch-pack.c b/fetch-pack.c
|
|
index 1734a573b0..ffdec5e56b 100644
|
|
--- a/fetch-pack.c
|
|
+++ b/fetch-pack.c
|
|
@@ -1268,9 +1268,29 @@ static int process_section_header(struct packet_reader *reader,
|
|
return ret;
|
|
}
|
|
|
|
-static int process_acks(struct fetch_negotiator *negotiator,
|
|
- struct packet_reader *reader,
|
|
- struct oidset *common)
|
|
+enum common_found {
|
|
+ /*
|
|
+ * No commit was found to be possessed by both the client and the
|
|
+ * server, and "ready" was not received.
|
|
+ */
|
|
+ NO_COMMON_FOUND,
|
|
+
|
|
+ /*
|
|
+ * At least one commit was found to be possessed by both the client and
|
|
+ * the server, and "ready" was not received.
|
|
+ */
|
|
+ COMMON_FOUND,
|
|
+
|
|
+ /*
|
|
+ * "ready" was received, indicating that the server is ready to send
|
|
+ * the packfile without any further negotiation.
|
|
+ */
|
|
+ READY
|
|
+};
|
|
+
|
|
+static enum common_found process_acks(struct fetch_negotiator *negotiator,
|
|
+ struct packet_reader *reader,
|
|
+ struct oidset *common)
|
|
{
|
|
/* received */
|
|
int received_ready = 0;
|
|
@@ -1320,7 +1340,8 @@ static int process_acks(struct fetch_negotiator *negotiator,
|
|
die(_("expected no other sections to be sent after no 'ready'"));
|
|
|
|
/* return 0 if no common, 1 if there are common, or 2 if ready */
|
|
- return received_ready ? 2 : (received_ack ? 1 : 0);
|
|
+ return received_ready ? READY :
|
|
+ (received_ack ? COMMON_FOUND : NO_COMMON_FOUND);
|
|
}
|
|
|
|
static void receive_shallow_info(struct fetch_pack_args *args,
|
|
@@ -1508,13 +1529,13 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
|
|
case FETCH_PROCESS_ACKS:
|
|
/* Process ACKs/NAKs */
|
|
switch (process_acks(negotiator, &reader, &common)) {
|
|
- case 2:
|
|
+ case READY:
|
|
state = FETCH_GET_PACK;
|
|
break;
|
|
- case 1:
|
|
+ case COMMON_FOUND:
|
|
in_vain = 0;
|
|
/* fallthrough */
|
|
- default:
|
|
+ case NO_COMMON_FOUND:
|
|
state = FETCH_SEND_REQUEST;
|
|
break;
|
|
}
|
|
--
|
|
2.26.1
|
|
|