diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-19 19:43:01 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-19 19:43:02 +0200 |
| commit | 069dba2a09cd9a3959194c871f475391b0960844 (patch) | |
| tree | 7a96e7cd990a51be3966ee3832a737408f1b19c4 /sha1_name.c | |
| parent | Merge branch 'vl/typofix' into maint (diff) | |
| parent | get_short_sha1(): correctly disambiguate type-limited abbreviation (diff) | |
| download | git-069dba2a09cd9a3959194c871f475391b0960844.tar.xz git-069dba2a09cd9a3959194c871f475391b0960844.zip | |
Merge branch 'jc/t1512-fix' into maint
* 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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c index b3a90e6f05..0077dbd50b 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; |