Subject: [PATCH 1/2] upload-pack: send shallow-info before wanted-refs in protocol v2

From: Matthew Dodd <[email-masked]>
Date: Wed, 24 Dec 2025 01:35:03 +0100

From: Mats-Dodd <[email-masked]>

The protocol v2 specification (Documentation/gitprotocol-v2.adoc) defines
the ordering of optional sections in the fetch response as:

    [acknowledgments delim-pkt] [shallow-info delim-pkt]
    [wanted-refs delim-pkt] [packfile-uris delim-pkt]
    packfile flush-pkt

However, since the ref-in-want feature was introduced in 516e2b76bdc
(upload-pack: implement ref-in-want, 2018-06-27), the server sends
wanted-refs before shallow-info. This violates the specification and
breaks the client (fetch-pack.c), which expects shallow-info first.

When a client performs a shallow clone/fetch against a server with
uploadpack.allowRefInWant=true, the client receives sections in the
wrong order and fails with:

    fatal: expected 'packfile', received 'shallow-info'

Fix by swapping the order of send_shallow_info() and
send_wanted_ref_info() to match both the protocol specification and
client expectations.

Signed-off-by: Mats-Dodd <[email-masked]>
---
 upload-pack.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upload-pack.c b/upload-pack.c
index 1e87ae9559..029ca93e69 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1830,8 +1830,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.47.0