[PATCH 1/2] peel_onion: disambiguate to favor tree-ish when we want a tree-ish
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 31, 2013, 22:38 UTC
- Message-ID
- <7v38vbp53n.fsf_-_@alter.siamese.dyndns.org>
- In-Reply-To
- <7vhajtpdtc.fsf@alter.siamese.dyndns.org>
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> ---
Junio C Hamano <gitster@pobox.com> writes:
> Perhaps something like this. Note that the last hunk is unrelated > thinko-fix I noticed while browsing the code.
sha1_name.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/sha1_name.c b/sha1_name.c index c50630a..45788df 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;
-- 1.8.2-441-g6e6f07b