| commit | ed1ca6025f965360e42ece66dcbc78bf0c2099a9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 31 Mar 2013 22:19:52 +0000 (31 15:19 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 31 Mar 2013 22:19:52 +0000 (31 15:19 -0700) | ||
| tree | 5684b2b6d5425e8cb8145e26f5b8f0f117186085 | treesnapshot (tar.gz zip) |
| parent | 3322ad428446b2d54e95b50fc70abc1ece1f4069 | commitdiff |
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>
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>
| sha1_name.c | diffblobblamehistory |