From: Matthew Dodd <mats.dodd12@gmail•com>
To: git@vger•kernel.org
Cc: Brandon Williams <bmwill@google•com>,
Junio C Hamano <gitster@pobox•com>,
Johannes Schindelin <Johannes.Schindelin@gmx•de>,
Mats-Dodd <mats.dodd12@gmail•com>
Subject: [PATCH 1/2] upload-pack: send shallow-info before wanted-refs in protocol v2
Date: Wed, 24 Dec 2025 01:35:03 +0100 [thread overview]
Message-ID: <20251224003504.52660-2-mats.dodd12@gmail.com> (raw)
In-Reply-To: <20251224003504.52660-1-mats.dodd12@gmail.com>
From: Mats-Dodd <mats.dodd12@gmail•com>
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 <mats.dodd12@gmail•com>
---
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
next prev parent reply other threads:[~2025-12-24 0:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-24 0:35 [PATCH 0/2] Fix shallow clone with ref-in-want enabled Matthew Dodd
2025-12-24 0:35 ` Matthew Dodd [this message]
2026-01-05 13:00 ` [PATCH 1/2] upload-pack: send shallow-info before wanted-refs in protocol v2 Patrick Steinhardt
2025-12-24 0:35 ` [PATCH 2/2] t5703: add test for shallow fetch with ref-in-want Matthew Dodd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251224003504.52660-2-mats.dodd12@gmail.com \
--to=mats.dodd12@gmail$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=bmwill@google$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox