From ed1ca6025f965360e42ece66dcbc78bf0c2099a9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 31 Mar 2013 15:19:52 -0700 Subject: 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 --- sha1_name.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sha1_name.c') 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; -- cgit v1.2.1