Re: [PATCH] remote-curl: don't pass back fake refs
- From
Jeff King <peff@peff.net>
- Date
- Dec 19, 2011, 17:10 UTC
- Message-ID
- <20111219171055.GA21227@sigill.intra.peff.net>
- In-Reply-To
- <20111217104539.GA23844@sigill.intra.peff.net>
On Sat, Dec 17, 2011 at 05:45:39AM -0500, Jeff King wrote:
Show 11 quoted lines
> Most of the time this bug goes unnoticed, as the fake ref
> won't match our refspecs. However, if "--mirror" is used,
> then we see it as remote cruft to be pruned, and try to pass
> along a deletion refspec for it. Of course this refspec has
> bogus syntax (because of the ^{}), and the helper complains,
> aborting the push.
>
> Let's have remote-curl mirror what the builtin
> get_refs_via_connect does (at least for the case of using
> git protocol; we can leave the dumb info/refs reader as it
> is).I did some experimenting, and this also fixes another bug: pushing with --mirror to a smart-http remote that uses alternates.
The fake ".have" refs that the server produces are similarly bogus and should not be passed back from remote-curl to the parent git process. Currently they are, so you get:
remote part of refspec is not a valid name in :.have
in the --mirror case.
I had thought this patch wouldn't make a difference there, since get_remote_heads handles ".have" specifically before the check_refname call. But it only does so if you pass in a non-NULL extra_have_objects pointer. We do for regular git (since we care about the .haves for efficiency, obviously).
But for smart-http, we actually end up parsing the refs twice: once to get the list of refs to hand back to the parent git process, and then again later in a send-pack subprocess that actually does care about the .haves. In the first one, we just pass NULL for extra_have, and get_remote_heads happily adds the bogus ones to the list.
For the same reason that this patch squelches the bogus "capability^{}", it also squelches the bogus ".have" refs (but of course they are still in our buffer to be handed to send-pack, so there is no loss of efficiency).
Perhaps we should squash in the test below, which demonstrates the breakage. I also wonder if this is maint-worthy.
-Peff
---
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index 89232b2..9b85d42 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -168,5 +168,23 @@ test_expect_success 'push --mirror can push to empty repo' ' git push --mirror "$HTTPD_URL"/smart/empty-mirror.git ' +test_expect_success 'push --all to repo with alternates' ' + s=$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git && + d=$HTTPD_DOCUMENT_ROOT_PATH/alternates-all.git && + git clone --bare --shared "$s" "$d" && + git --git-dir="$d" config http.receivepack true && + git --git-dir="$d" repack -adl && + git push --all "$HTTPD_URL"/smart/alternates-all.git +' + +test_expect_success 'push --mirror to repo with alternates' ' + s=$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git && + d=$HTTPD_DOCUMENT_ROOT_PATH/alternates-mirror.git && + git clone --bare --shared "$s" "$d" && + git --git-dir="$d" config http.receivepack true && + git --git-dir="$d" repack -adl && + git push --mirror "$HTTPD_URL"/smart/alternates-mirror.git +' + stop_httpd test_done