From: Junio C Hamano <gitster@pobox.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: "Torsten Bögershausen" <tboegi@web.de>,
"Jeff King" <peff@peff.net>, 孟子易 <mengziyi540841@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH v2 3/3] shorten_unambiguous_ref(): avoid sscanf()
Date: Thu, 16 Feb 2023 09:21:15 -0800 [thread overview]
Message-ID: <xmqqlekxr0fo.fsf@gitster.g> (raw)
In-Reply-To: <CAPig+cR3fNVnLcfR0K85YgVo3go2p9cbC9ekdmm=orh0WQ+HwQ@mail.gmail.com> (Eric Sunshine's message of "Thu, 16 Feb 2023 01:16:35 -0500")
Eric Sunshine <sunshine@sunshineco.com> writes:
>> d) Mention MacOs here ?
>
> Certainly, a good idea.
Yes.
>> test_expect_success 'symbolic-ref --short handles complex utf8 case' '
>> name="测试-加-增加-加-增加" &&
>> git symbolic-ref TEST_SYMREF "refs/heads/$name" &&
>> # In the real world, we saw problems with this case only under MacOs Ventura
>
> I'm on ancient High Sierra (10.13) using HFS+, so the problem is not
> Ventura-specific. The original bug report did mention Ventura (which
> presumably is using APFS).
I do not think the bug is in sscanf() and not in the code that deals
with filenames in the filesystem. The symbolic-ref TEST_SYMREF is
implemented by writing the problematic string into a regular file,
and we read it as a stream of bytes---there is no chance for things
like filename normalization the filesystem tries to do to corrupt
it. So reference to "under macOS Ventuara" I think is about their C
library, not a particular filesystem it uses.
How about a bit more detail on sscanf(), like this?
t/t1401-symbolic-ref.sh | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git c/t/t1401-symbolic-ref.sh w/t/t1401-symbolic-ref.sh
index be23be30c7..dafcb4d61b 100755
--- c/t/t1401-symbolic-ref.sh
+++ w/t/t1401-symbolic-ref.sh
@@ -192,11 +192,13 @@ test_expect_success 'symbolic-ref pointing at another' '
test_expect_success 'symbolic-ref --short handles complex utf8 case' '
name="测试-加-增加-加-增加" &&
git symbolic-ref TEST_SYMREF "refs/heads/$name" &&
- # In the real world, we saw problems with this case only
- # when the locale includes UTF-8. Set it here to try to make things as
- # hard as possible for us to pass, but in practice we should do the
- # right thing regardless (and of course some platforms may not even
- # have this locale).
+ # In the real world, we saw this case misbehaved on macOS only
+ # when the locale includes UTF-8, back when "symbolic-ref --short"
+ # used sscanf(3) as part of its implementation. Set it here to
+ # try to make things as hard as possible for us to pass, but in
+ # practice we should do the right thing regardless (and of course
+ # some platforms may not even have this locale), as we no longer
+ # use platform sscanf(3) there.
LC_ALL=en_US.UTF-8 git symbolic-ref --short TEST_SYMREF >actual &&
echo "$name" >expect &&
test_cmp expect actual
next prev parent reply other threads:[~2023-02-16 17:21 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 6:38 bug report: symbolic-ref --short command echos the wrong text while use Chinese language 孟子易
2023-02-13 20:18 ` Jeff King
2023-02-13 22:58 ` Eric Sunshine
2023-02-14 1:39 ` Jeff King
2023-02-14 5:15 ` Eric Sunshine
2023-02-14 5:33 ` Eric Sunshine
2023-02-14 5:40 ` Junio C Hamano
2023-02-14 6:05 ` Eric Sunshine
2023-02-14 6:45 ` Junio C Hamano
2023-02-14 6:55 ` Eric Sunshine
2023-02-14 16:01 ` Jeff King
2023-02-14 16:29 ` Eric Sunshine
2023-02-14 17:07 ` Jeff King
2023-02-14 18:38 ` [PATCH 0/3] get rid of sscanf() when shortening refs Jeff King
2023-02-14 18:39 ` [PATCH 1/3] shorten_unambiguous_ref(): avoid integer truncation Jeff King
2023-02-14 18:40 ` [PATCH 2/3] shorten_unambiguous_ref(): use NUM_REV_PARSE_RULES constant Jeff King
2023-02-14 21:34 ` Junio C Hamano
2023-02-14 22:23 ` Jeff King
2023-02-14 18:41 ` [PATCH 3/3] shorten_unambiguous_ref(): avoid sscanf() Jeff King
2023-02-14 21:48 ` Junio C Hamano
2023-02-14 22:25 ` Junio C Hamano
2023-02-14 22:30 ` Jeff King
2023-02-14 22:34 ` Junio C Hamano
2023-02-14 22:40 ` Jeff King
2023-02-15 5:10 ` Junio C Hamano
2023-02-15 14:30 ` Jeff King
2023-02-15 16:41 ` Junio C Hamano
2023-02-14 23:20 ` Eric Sunshine
2023-02-15 15:16 ` [PATCH v2 0/3] get rid of sscanf() when shortening refs Jeff King
2023-02-15 15:16 ` [PATCH v2 1/3] shorten_unambiguous_ref(): avoid integer truncation Jeff King
2023-02-15 15:16 ` [PATCH v2 2/3] shorten_unambiguous_ref(): use NUM_REV_PARSE_RULES constant Jeff King
2023-02-15 15:16 ` [PATCH v2 3/3] shorten_unambiguous_ref(): avoid sscanf() Jeff King
2023-02-16 5:56 ` Torsten Bögershausen
2023-02-16 6:16 ` Eric Sunshine
2023-02-16 17:21 ` Junio C Hamano [this message]
2023-02-16 17:28 ` Jeff King
2023-02-16 23:36 ` Junio C Hamano
2023-02-16 17:31 ` Jeff King
2023-02-17 6:46 ` Torsten Bögershausen
2023-02-15 18:00 ` [PATCH v2 0/3] get rid of sscanf() when shortening refs Junio C Hamano
2023-02-14 16:40 ` bug report: symbolic-ref --short command echos the wrong text while use Chinese language Junio C Hamano
2023-02-14 17:40 ` Jeff King
2023-02-15 16:26 ` Torsten Bögershausen
2023-02-15 16:37 ` Eric Sunshine
2023-02-15 17:19 ` Torsten Bögershausen
2023-02-16 6:08 ` Eric Sunshine
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=xmqqlekxr0fo.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mengziyi540841@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=tboegi@web.de \
/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.
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 NNTP newsgroup(s).