aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-02 10:00:40 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-09 16:42:22 -0700
commite2643617d75e53e5a69278f8d7382553d1c14cf0 (patch)
treeafbcff536ceab46f29c80d65e56d08df721b3e9c /t
parente48ba200be908f02a3fb30adcbb8000b7100cb32 (diff)
downloadgit-e2643617d75e53e5a69278f8d7382553d1c14cf0.tar.gz
git-e2643617d75e53e5a69278f8d7382553d1c14cf0.tar.xz
sha1_name.c: many short names can only be committish
We know that the token "$name" that appear in "$name^{commit}", "$name^4", "$name~4" etc. can only name a committish (either a commit or a tag that peels to a commit). Teach get_short_sha1() to take advantage of that knowledge when disambiguating an abbreviated SHA-1 given as an object name. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t1512-rev-parse-disambiguation.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 0d3f05b99..7652f1c2e 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -85,7 +85,7 @@ test_expect_success 'first commit' '
git commit -m a2onsxbvj
'
-test_expect_failure 'disambiguate commit-ish' '
+test_expect_success 'disambiguate commit-ish' '
# feed commit-ish in an unambiguous way
git rev-parse --verify 0000000000e4f^{commit} &&