git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v5 2/2] Add new @ shortcut for HEAD

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 10, 2013, 22:08 UTC
Message-ID
<xmqq7geowcs3.fsf@gitster.dls.corp.google.com>
In-Reply-To
<xmqq38pd38t4.fsf@gitster.dls.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 30 quoted lines
> 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.

Previous: Junio C Hamano
Message 8 of 8 in “Add @ shortcut, again”
  1. 0/2 Add @ shortcut, againFelipe Contreras, Sep 2, 2013
  2. 1/2 sha1-name: pass len argument to interpret_branch_name()Felipe Contreras, Sep 2, 2013
  3. Junio C HamanoSep 3, 2013
  4. 2/2 Add new @ shortcut for HEADFelipe Contreras, Sep 2, 2013
  5. Junio C HamanoSep 3, 2013
  6. Felipe ContrerasSep 9, 2013
  7. Junio C HamanoSep 9, 2013
  8. Junio C HamanoSep 10, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.