summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-11 13:06:11 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-11 13:06:11 -0700
commiteb40e51597eb2cd36fcd4a3e56c9ecaa109ddefc (patch)
tree3b0529b61a5871b7299f606a824bf17b8f62ae76 /sha1_name.c
parentf3930e4389937eccdcaa204b134010e3c34463a4 (diff)
parent94d75d1ed5c03b3c0191221f8e3960d808ba7e23 (diff)
downloadgit-eb40e51597eb2cd36fcd4a3e56c9ecaa109ddefc.tar.gz
Merge branch 'jc/t1512-fix'
A test that should have failed but didn't revealed a bug that needs to be corrected. * jc/t1512-fix: get_short_sha1(): correctly disambiguate type-limited abbreviation t1512: correct leftover constants from earlier edition
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c
index 90419efe10..1a75fac05f 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -241,7 +241,7 @@ static int disambiguate_committish_only(const unsigned char *sha1, void *cb_data
return 0;
/* We need to do this the hard way... */
- obj = deref_tag(lookup_object(sha1), NULL, 0);
+ obj = deref_tag(parse_object(sha1), NULL, 0);
if (obj && obj->type == OBJ_COMMIT)
return 1;
return 0;