[PATCH] [PATCH] Fix upload_pack_v2 response ordering for shallow fetch when server has uploadpack.allowRefInWant=true
Signed-off-by: Royce Remer <royceremer@gmail.com>
---
t/t5703-upload-pack-ref-in-want.sh | 18 ++++++++++++++++++
upload-pack.c | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh
index 249137b467..9e2a090c9e 100755
--- a/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@@ -295,6 +295,24 @@ test_expect_success 'fetching with wildcard that matches multiple refs' '
grep "want-ref refs/heads/o/bar" log
'
+test_expect_success 'shallow clone with ref-in-want' '
+ rm -rf local &&
+ GIT_TEST_PROTOCOL_VERSION=2 git clone --depth=1 "file://$REPO" local &&
+ git -C "$REPO" rev-parse main >expected &&
+ git -C local rev-parse refs/remotes/origin/main >actual &&
+ test_cmp expected actual &&
+ git -C local log --oneline refs/remotes/origin/main >log &&
+ test_line_count = 1 log
+'
+
+test_expect_success 'incremental shallow fetch with ref-in-want' '
+ rm -rf local &&
+ GIT_TEST_PROTOCOL_VERSION=2 git clone --depth=1 "file://$REPO" local &&
+ GIT_TEST_PROTOCOL_VERSION=2 git -C local fetch --depth=2 origin main &&
+ git -C local log --oneline refs/remotes/origin/main >log &&
+ test_line_count = 2 log
+'
+
REPO="$(pwd)/repo-ns"
test_expect_success 'setup namespaced repo' '
diff --git a/upload-pack.c b/upload-pack.c
index a52856d869..a70d237ad3 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1812,8 +1812,8 @@ int upload_pack_v2(struct repository *r, struct packet_reader *request)
state = UPLOAD_DONE;
break;
case UPLOAD_SEND_PACK:
- send_wanted_ref_info(&data);
send_shallow_info(&data);
+ send_wanted_ref_info(&data);
if (data.uri_protocols.nr) {
create_pack_file(&data, &data.uri_protocols);
--
2.34.1