From: Linus Torvalds <torvalds@osdl.org>
To: "Brown, Len" <len.brown@intel.com>
Cc: Junio C Hamano <junkio@cox.net>,
Git Mailing List <git@vger.kernel.org>,
Paul Mackerras <paulus@samba.org>,
Marco Costalba <mcostalba@yahoo.it>,
Aneesh Kumar <aneesh.kumar@gmail.com>
Subject: RE: The merge from hell...
Date: Thu, 2 Feb 2006 22:16:05 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0602022210540.3462@g5.osdl.org> (raw)
In-Reply-To: <F7DC2337C7631D4386A2DF6E8FB22B3005EFE838@hdsmsx401.amr.corp.intel.com>
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.
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
next prev parent reply other threads:[~2006-02-03 6:16 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-03 6:04 The merge from hell Brown, Len
2006-02-03 6:16 ` Linus Torvalds [this message]
2006-02-03 6:33 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2006-02-03 18:34 Brown, Len
2006-02-04 2:35 ` Junio C Hamano
2006-02-04 2:47 ` Linus Torvalds
2006-02-03 6:41 linux
2006-02-03 4:20 Brown, Len
2006-02-03 5:45 ` Linus Torvalds
2006-02-03 6:28 ` Junio C Hamano
2006-02-03 16:21 ` Dave Jones
2006-02-02 6:28 Linus Torvalds
2006-02-02 7:05 ` Junio C Hamano
2006-02-02 7:51 ` Linus Torvalds
2006-02-02 7:55 ` Linus Torvalds
2006-02-02 8:08 ` Linus Torvalds
2006-02-04 10:46 ` Paul Mackerras
2006-02-04 12:22 ` Junio C Hamano
2006-02-04 19:42 ` Linus Torvalds
2006-02-04 20:59 ` Linus Torvalds
2006-02-02 7:25 ` Marco Costalba
2006-02-02 8:02 ` Linus Torvalds
2006-02-02 8:07 ` Aneesh Kumar
2006-02-02 8:27 ` Junio C Hamano
2006-02-02 8:44 ` Linus Torvalds
2006-02-02 10:41 ` Junio C Hamano
2006-02-05 19:42 ` Linus Torvalds
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=Pine.LNX.4.64.0602022210540.3462@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=aneesh.kumar@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=len.brown@intel.com \
--cc=mcostalba@yahoo.it \
--cc=paulus@samba.org \
/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).