Skip to content

Commit 0a8cb03

Browse files
committed
Merge branch 'br/sha1-name-40-hex-no-disambiguation'
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
2 parents a25014b + 832cf74 commit 0a8cb03

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sha1_name.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,9 +451,9 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
451451
int at, reflog_len, nth_prior = 0;
452452

453453
if (len == 40 && !get_sha1_hex(str, sha1)) {
454-
if (warn_on_object_refname_ambiguity) {
454+
if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
455455
refs_found = dwim_ref(str, len, tmp_sha1, &real_ref);
456-
if (refs_found > 0 && warn_ambiguous_refs) {
456+
if (refs_found > 0) {
457457
warning(warn_msg, len, str);
458458
if (advice_object_name_warning)
459459
fprintf(stderr, "%s\n", _(object_name_msg));

0 commit comments

Comments
 (0)