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

Re: The merge from hell...

From
Junio C Hamano <junkio@cox.net>
Date
Feb 3, 2006, 06:33 UTC
Message-ID
<7v1wylj6i5.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.64.0602022210540.3462@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
Show 8 quoted lines
> On Fri, 3 Feb 2006, Brown, Len wrote:
>>
>> In the back of my head I was worried about using plain
>> numbers when I saw somebody refer to "shorthand SHA1".
>> Hopefully this is an idle worry and it is not possible
>> for the tool to confuse a numeric branch name with a SHA1 id.
>
> It _is_ possible, but the rule is that references will be resolved first.

I have to admit that I had this broken for a while. The breakage was when you have the same numeric branch name _and_ tagname, then ref resolution was skipped and short SHA1 was taken. It _might_ have bitten somebody in real life until I fixed it. But I believe this is fixed now.

> It's pretty unlikely, of course. But it's one reason to try to avoid using 
> ref names that are numeric.
Or even non numeric ones, like "deadbeef".
Previous: Linus Torvalds
Message 3 of 3 in “RE: The merge from hell...”
  1. Brown, LenFeb 3, 2006
  2. Linus TorvaldsFeb 3, 2006
  3. Junio C HamanoFeb 3, 2006

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.