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

RE: The merge from hell...

From
Linus Torvalds <torvalds@osdl.org>
Date
Feb 3, 2006, 06:16 UTC
Message-ID
<Pine.LNX.4.64.0602022210540.3462@g5.osdl.org>
In-Reply-To
<F7DC2337C7631D4386A2DF6E8FB22B3005EFE838@hdsmsx401.amr.corp.intel.com>
On Fri, 3 Feb 2006, Brown, Len wrote:
Show 5 quoted lines
>
> 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.

If you mis-type a reference and it could be construed as a short hex SHA1 ID (it needs to have more than 5 characters in it to trigger, though), the auto-completion of SHA1 ID's could bite you, though.

It's pretty unlikely, of course. But it's one reason to try to avoid using ref names that are numeric.

		Linus
Previous: Brown, LenNext: Junio C Hamano
Message 2 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.