summaryrefslogtreecommitdiffstats
path: root/t/t1512-rev-parse-disambiguation.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-03 19:03:38 +0200
committerJunio C Hamano <gitster@pobox.com>2012-07-10 01:42:22 +0200
commit75f5ac04a2984fcf1e4d167047bfb63c5f385d44 (patch)
tree105f430c6dfbbab0124f315f1571b4cdbb0af925 /t/t1512-rev-parse-disambiguation.sh
parentapply: --build-fake-ancestor expects blobs (diff)
downloadgit-75f5ac04a2984fcf1e4d167047bfb63c5f385d44.tar.xz
git-75f5ac04a2984fcf1e4d167047bfb63c5f385d44.zip
commit-tree: the command wants a tree and commits
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
-rwxr-xr-xt/t1512-rev-parse-disambiguation.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 84b8dddbe3..dc56f81cb7 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -75,7 +75,7 @@ test_expect_success 'disambiguate blob' '
test_cmp a0blgqsjc actual
'
-test_expect_failure 'disambiguate tree' '
+test_expect_success 'disambiguate tree' '
commit=$(echo "d7xm" | git commit-tree 000000000) &&
test $(git rev-parse $commit^{tree}) = $(git rev-parse 0000000000cdc)
'
@@ -97,7 +97,7 @@ test_expect_success 'disambiguate commit-ish' '
git rev-parse --verify 000000000^0
'
-test_expect_failure 'disambiguate commit' '
+test_expect_success 'disambiguate commit' '
commit=$(echo "j9xqh" | git commit-tree 0000000000cdc -p 000000000) &&
test $(git rev-parse $commit^) = $(git rev-parse 0000000000e4f)
'