aboutsummaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-31 15:19:52 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-31 15:19:52 -0700
commited1ca6025f965360e42ece66dcbc78bf0c2099a9 (patch)
tree5684b2b6d5425e8cb8145e26f5b8f0f117186085 /sha1_name.c
parent3322ad428446b2d54e95b50fc70abc1ece1f4069 (diff)
downloadgit-ed1ca6025f965360e42ece66dcbc78bf0c2099a9.tar.gz
git-ed1ca6025f965360e42ece66dcbc78bf0c2099a9.tar.xz
peel_onion: disambiguate to favor tree-ish when we know we want a tree-ish
The function already knows when interpreting $foo^{commit} to tell the underlying get_sha1_1() to expect a commit-ish while evaluating $foo. Teach it to do the same when asked for $foo^{tree}; we are expecting a tree-ish and $foo should be disambiguated in favor of a tree-ish, discarding a possible ambiguous match with a blob object. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sha1_name.c b/sha1_name.c
index c50630a3e..45788df8b 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -654,6 +654,8 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
if (expected_type == OBJ_COMMIT)
lookup_flags = GET_SHA1_COMMITTISH;
+ else if (expected_type == OBJ_TREE)
+ lookup_flags = GET_SHA1_TREEISH;
if (get_sha1_1(name, sp - name - 2, outer, lookup_flags))
return -1;