From: Andrzej Hunt <andrzej@ahunt.org>
To: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Cc: Andrzej Hunt via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Taylor Blau <me@ttaylorr.com>,
"brian m . carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH] connect: also update offset for features without values
Date: Sun, 26 Sep 2021 17:16:22 +0200 [thread overview]
Message-ID: <e1395ff2-e697-83b2-082b-d5468b7a11ac@ahunt.org> (raw)
In-Reply-To: <YUz5dPB6/jFmdSRU@coredump.intra.peff.net>
On 24/09/2021 00:02, Jeff King wrote:
> On Thu, Sep 23, 2021 at 02:52:53PM -0700, Junio C Hamano wrote:
>
>> Jeff King <peff@peff.net> writes:
>>
>>> I think the problem is that our fake upload-pack exits immediately, so
>>> ls-remote gets SIGPIPE. In a v0 conversation, ls-remote expects to say
>>> "0000" to indicate that it's not interested in fetching anything (in v2,
>>> it doesn't bother, since fetching would be a separate request that it
>>> just declines to make).
>>
>> Ah, Makes sense---the usual SIGPIPE problem ;-)
>
> Yes, though it definitely took some head-scratching for me to see where
> it was. ;)
>
> Doing: "./t5704-* --stress" made it pretty clear. It fails almost
> immediately, and mentions SIGPIPE (well, exit code 141, but by now I
> have that one memorized).
>
>>> This seems to fix it:
>>>
>>> diff --git a/t/t5704-protocol-violations.sh b/t/t5704-protocol-violations.sh
>>> index 34538cebf0..0983c2b507 100755
>>> --- a/t/t5704-protocol-violations.sh
>>> +++ b/t/t5704-protocol-violations.sh
>>> @@ -40,7 +40,7 @@ test_expect_success 'bogus symref in v0 capabilities' '
>>> test-tool pkt-line pack-raw-stdin &&
>>> printf "0000"
>>> } >input &&
>>> - git ls-remote --upload-pack="cat input ;:" . >actual &&
>>> + git ls-remote --upload-pack="cat input; read junk;:" . >actual &&
>>> printf "%s\tHEAD\n" "$oid" >expect &&
>>> test_cmp expect actual
>>> '
>>
>> Yup. In the original thread there was some further back-and-forth
>> about further improving the test, if I recall correctly; has the
>> issue been settled there, or is everybody happy with the above
>> version?
>
> I think the change I showed earlier (to use ls-remote --symref) is worth
> doing. There was lots of discussion about how to format a tab, but in
> the end I don't think it really matters.
>
> So here's that patch again, with this race fix on top, which could be
> squashed in, and then I hope we can call it good.
Thanks again for doing the actual work - I'll send out a V2 with your
changes squashed in, along with an attempt at improving the commit
message (as discussed in reply to Taylor's comments).
>
> diff --git a/t/t5704-protocol-violations.sh b/t/t5704-protocol-violations.sh
> index 34538cebf0..bc393d7c31 100755
> --- a/t/t5704-protocol-violations.sh
> +++ b/t/t5704-protocol-violations.sh
> @@ -35,13 +35,15 @@ test_expect_success 'extra delim packet in v2 fetch args' '
> test_expect_success 'bogus symref in v0 capabilities' '
> test_commit foo &&
> oid=$(git rev-parse HEAD) &&
> + dst=refs/heads/foo &&
> {
> - printf "%s HEAD\0symref object-format=%s\n" "$oid" "$GIT_DEFAULT_HASH" |
> + printf "%s HEAD\0symref object-format=%s symref=HEAD:%s\n" \
> + "$oid" "$GIT_DEFAULT_HASH" "$dst" |
> test-tool pkt-line pack-raw-stdin &&
> printf "0000"
> } >input &&
> - git ls-remote --upload-pack="cat input ;:" . >actual &&
> - printf "%s\tHEAD\n" "$oid" >expect &&
> + git ls-remote --symref --upload-pack="cat input; read junk;:" . >actual &&
> + printf "ref: %s\tHEAD\n%s\tHEAD\n" "$dst" "$oid" >expect &&
> test_cmp expect actual
> '
>
>
next prev parent reply other threads:[~2021-09-26 15:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-18 13:14 [PATCH] connect: also update offset for features without values Andrzej Hunt via GitGitGadget
2021-09-18 15:53 ` Taylor Blau
2021-09-18 22:05 ` Jeff King
2021-09-18 22:35 ` Taylor Blau
2021-09-19 1:02 ` Eric Sunshine
2021-09-19 2:20 ` Jeff King
2021-09-19 2:53 ` Eric Sunshine
2021-09-19 7:12 ` Junio C Hamano
2021-09-26 15:14 ` Andrzej Hunt
2021-09-18 17:18 ` brian m. carlson
2021-09-23 21:20 ` Junio C Hamano
2021-09-23 21:38 ` Jeff King
2021-09-23 21:52 ` Junio C Hamano
2021-09-23 22:02 ` Jeff King
2021-09-26 15:16 ` Andrzej Hunt [this message]
2021-09-26 15:58 ` [PATCH v2] " Andrzej Hunt via GitGitGadget
2021-09-27 19:47 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e1395ff2-e697-83b2-082b-d5468b7a11ac@ahunt.org \
--to=andrzej@ahunt.org \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).