rev-parse test: modernize quoting and whitespace
Instead of cramming everything in one line, put the test body in an indented block after the opening test_expect_success line and quote and put the closing quote on a line by itself. Use single-quote instead of double-quote to quote the test body for more useful --verbose output. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e230c568c4
commit
dfb1dc5c33
@ -17,21 +17,62 @@ hide_error save_tag start2 unique_commit "start2" tree
|
||||
save_tag two_parents unique_commit "next" tree -p second -p start2
|
||||
save_tag final unique_commit "final" tree -p two_parents
|
||||
|
||||
test_expect_success 'start is valid' 'git rev-parse start | grep "^[0-9a-f]\{40\}$"'
|
||||
test_expect_success 'start^0' "test $(cat .git/refs/tags/start) = $(git rev-parse start^0)"
|
||||
test_expect_success 'start^1 not valid' "if git rev-parse --verify start^1; then false; else :; fi"
|
||||
test_expect_success 'second^1 = second^' "test $(git rev-parse second^1) = $(git rev-parse second^)"
|
||||
test_expect_success 'final^1^1^1' "test $(git rev-parse start) = $(git rev-parse final^1^1^1)"
|
||||
test_expect_success 'final^1^1^1 = final^^^' "test $(git rev-parse final^1^1^1) = $(git rev-parse final^^^)"
|
||||
test_expect_success 'final^1^2' "test $(git rev-parse start2) = $(git rev-parse final^1^2)"
|
||||
test_expect_success 'final^1^2 != final^1^1' "test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)"
|
||||
test_expect_success 'final^1^3 not valid' "if git rev-parse --verify final^1^3; then false; else :; fi"
|
||||
test_expect_success '--verify start2^1' 'test_must_fail git rev-parse --verify start2^1'
|
||||
test_expect_success '--verify start2^0' 'git rev-parse --verify start2^0'
|
||||
test_expect_success 'final^1^@ = final^1^1 final^1^2' "test \"$(git rev-parse final^1^@)\" = \"$(git rev-parse final^1^1 final^1^2)\""
|
||||
test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' "test \"$(git rev-parse final^1^\!)\" = \"$(git rev-parse final^1 ^final^1^1 ^final^1^2)\""
|
||||
test_expect_success 'start is valid' '
|
||||
git rev-parse start | grep "^[0-9a-f]\{40\}$"
|
||||
'
|
||||
|
||||
test_expect_success 'start^0' '
|
||||
test $(cat .git/refs/tags/start) = $(git rev-parse start^0)
|
||||
'
|
||||
|
||||
test_expect_success 'start^1 not valid' '
|
||||
if git rev-parse --verify start^1; then false; else :; fi
|
||||
'
|
||||
|
||||
test_expect_success 'second^1 = second^' '
|
||||
test $(git rev-parse second^1) = $(git rev-parse second^)
|
||||
'
|
||||
|
||||
test_expect_success 'final^1^1^1' '
|
||||
test $(git rev-parse start) = $(git rev-parse final^1^1^1)
|
||||
'
|
||||
|
||||
test_expect_success 'final^1^1^1 = final^^^' '
|
||||
test $(git rev-parse final^1^1^1) = $(git rev-parse final^^^)
|
||||
'
|
||||
|
||||
test_expect_success 'final^1^2' '
|
||||
test $(git rev-parse start2) = $(git rev-parse final^1^2)
|
||||
'
|
||||
|
||||
test_expect_success 'final^1^2 != final^1^1' '
|
||||
test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)
|
||||
'
|
||||
|
||||
test_expect_success 'final^1^3 not valid' '
|
||||
if git rev-parse --verify final^1^3; then false; else :; fi
|
||||
'
|
||||
|
||||
test_expect_success '--verify start2^1' '
|
||||
test_must_fail git rev-parse --verify start2^1
|
||||
'
|
||||
|
||||
test_expect_success '--verify start2^0' '
|
||||
git rev-parse --verify start2^0
|
||||
'
|
||||
|
||||
test_expect_success 'final^1^@ = final^1^1 final^1^2' '
|
||||
test "$(git rev-parse final^1^@)" = "$(git rev-parse final^1^1 final^1^2)"
|
||||
'
|
||||
|
||||
test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' '
|
||||
test "$(git rev-parse final^1^!)" = "$(git rev-parse final^1 ^final^1^1 ^final^1^2)"
|
||||
'
|
||||
|
||||
test_expect_success 'repack for next test' '
|
||||
git repack -a -d
|
||||
'
|
||||
|
||||
test_expect_success 'repack for next test' 'git repack -a -d'
|
||||
test_expect_success 'short SHA-1 works' '
|
||||
start=`git rev-parse --verify start` &&
|
||||
echo $start &&
|
||||
@ -39,6 +80,7 @@ test_expect_success 'short SHA-1 works' '
|
||||
echo $abbrv &&
|
||||
abbrv=`git rev-parse --verify $abbrv` &&
|
||||
echo $abbrv &&
|
||||
test $start = $abbrv'
|
||||
test $start = $abbrv
|
||||
'
|
||||
|
||||
test_done
|
||||
|
Loading…
Reference in New Issue
Block a user