From: Junio C Hamano <gitster@pobox•com>
To: Felipe Contreras <felipe.contreras@gmail•com>
Cc: git@vger•kernel.org, Stefano Lattarini <stefano.lattarini@gmail•com>
Subject: Re: [PATCH v5 2/2] Add new @ shortcut for HEAD
Date: Tue, 10 Sep 2013 15:08:12 -0700 [thread overview]
Message-ID: <xmqq7geowcs3.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqq38pd38t4.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Mon, 09 Sep 2013 15:54:31 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> Felipe Contreras <felipe.contreras@gmail•com> writes:
>
>>> Hmph, is the above sufficient? I added a case that mimics Stefano's
>>> original regression report (which is handled) and another that uses
>>> doubled "@" for the same purpose of introducing a "funny" hierarchy,
>>> and it appears that "checkout -b" chokes on it.
>>
>> This fixes it:
>>
>> --- a/sha1_name.c
>> +++ b/sha1_name.c
>> @@ -1014,6 +1014,8 @@ static int interpret_empty_at(const char *name,
>> int namelen, int len, struct str
>>
>> /* make sure it's a single @, or @@{.*}, not @foo */
>> next = strchr(name + len + 1, '@');
>> + if (next && next[1] != '{')
>> + return -1;
>> if (!next)
>> next = name + namelen;
>> if (next != name + 1)
>
> I think this should be sufficient for all cases, as the sequence
> "@{" cannot be a part of valid reference names.
>
> Thanks.
>
> I see v6 was posted yesterday after this message, but it does not
> seem to have this fix, nor the additional test case I gave you in
> the message upthread. Sent a wrong version of patch by mistake?
Ping?
I could squash the fixup at the tip of on fc/at-head in if you want
me to, but v6 seems to be a mistake to me.
prev parent reply other threads:[~2013-09-10 22:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-02 6:34 [PATCH v5 0/2] Add @ shortcut, again Felipe Contreras
2013-09-02 6:34 ` [PATCH v5 1/2] sha1-name: pass len argument to interpret_branch_name() Felipe Contreras
2013-09-03 18:40 ` Junio C Hamano
2013-09-02 6:34 ` [PATCH v5 2/2] Add new @ shortcut for HEAD Felipe Contreras
2013-09-03 18:50 ` Junio C Hamano
2013-09-09 2:09 ` Felipe Contreras
2013-09-09 22:54 ` Junio C Hamano
2013-09-10 22:08 ` Junio C Hamano [this message]
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=xmqq7geowcs3.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=felipe.contreras@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=stefano.lattarini@gmail$(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