Merge branch 'br/sha1-name-40-hex-no-disambiguation'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Jan 2014 19:33:29 +0000 (11:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Jan 2014 19:33:29 +0000 (11:33 -0800)
When parsing a 40-hex string into the object name, the string is
checked to see if it can be interpreted as a ref so that a warning
can be given for ambiguity. The code kicked in even when the
core.warnambiguousrefs is set to false to squelch this warning, in
which case the cycles spent to look at the ref namespace were an
expensive no-op, as the result was discarded without being used.

* br/sha1-name-40-hex-no-disambiguation:
sha1_name: don't resolve refs when core.warnambiguousrefs is false

1  2 
sha1_name.c
diff --cc sha1_name.c
Simple merge