Skip to content

Commit

Permalink
t1512: match the "other" object names
Browse files Browse the repository at this point in the history
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 <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Jul 13, 2012
1 parent 4c654f5 commit 31ffd0c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions t/t1512-rev-parse-disambiguation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
'

Expand Down Expand Up @@ -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 <actual) = 16 &&
test "$(sed -e "s/^\(.........\).*/\1/" actual | sort -u)" = 000000000
Expand Down

0 comments on commit 31ffd0c

Please sign in to comment.