From 31ffd0c0c1255cb7e9ba76192a70ae294faf95bf Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 13 Jul 2012 12:43:43 -0700 Subject: [PATCH] t1512: match the "other" object names The test creates 16 objects that share the same prefix, and two other objects that do not. Tweak the test so that the other two share the same prefix that is different from the one that is shared by the 16. Signed-off-by: Junio C Hamano --- t/t1512-rev-parse-disambiguation.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh index 1eb35143f8..6b3d797cea 100755 --- a/t/t1512-rev-parse-disambiguation.sh +++ b/t/t1512-rev-parse-disambiguation.sh @@ -98,7 +98,7 @@ test_expect_success 'disambiguate commit-ish' ' ' test_expect_success 'disambiguate commit' ' - commit=$(echo "j9xqh" | git commit-tree 0000000000cdc -p 000000000) && + commit=$(echo "hoaxj" | git commit-tree 0000000000cdc -p 000000000) && test $(git rev-parse $commit^) = $(git rev-parse 0000000000e4f) ' @@ -254,8 +254,8 @@ test_expect_success 'ambiguous commit-ish' ' test_expect_success 'rev-parse --disambiguate' ' # The test creates 16 objects that share the prefix and two - # commits created by commit-tree in earlier tests do not share - # the prefix. + # commits created by commit-tree in earlier tests share a + # different prefix. git rev-parse --disambiguate=000000000 >actual && test $(wc -l