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>
Felipe Contreras committed
Sep 3, 2013 at 10:05 UTC
dfb1dc5c336f3fa709e32ce178525768713747f2
1 file changed
+58
-16
t/t6101-rev-parse-parents.sh
+58
-16
@@ -17,21 +17,62 @@ hide_error save_tag start2 unique_commit "start2" tree
17
save_tag two_parents unique_commit "next" tree -p second -p start2
18
save_tag final unique_commit "final" tree -p two_parents
19
20
-test_expect_success 'start is valid' 'git rev-parse start | grep "^[0-9a-f]\{40\}$"'
21
-test_expect_success 'start^0' "test $(cat .git/refs/tags/start) = $(git rev-parse start^0)"
22
-test_expect_success 'start^1 not valid' "if git rev-parse --verify start^1; then false; else :; fi"
23
-test_expect_success 'second^1 = second^' "test $(git rev-parse second^1) = $(git rev-parse second^)"
24
-test_expect_success 'final^1^1^1' "test $(git rev-parse start) = $(git rev-parse final^1^1^1)"
25
-test_expect_success 'final^1^1^1 = final^^^' "test $(git rev-parse final^1^1^1) = $(git rev-parse final^^^)"
26
-test_expect_success 'final^1^2' "test $(git rev-parse start2) = $(git rev-parse final^1^2)"
27
-test_expect_success 'final^1^2 != final^1^1' "test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)"
28
-test_expect_success 'final^1^3 not valid' "if git rev-parse --verify final^1^3; then false; else :; fi"
29
-test_expect_success '--verify start2^1' 'test_must_fail git rev-parse --verify start2^1'
30
-test_expect_success '--verify start2^0' 'git rev-parse --verify start2^0'
31
-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)\""
32
-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)\""
33
-
34
-test_expect_success 'repack for next test' 'git repack -a -d'
20
+test_expect_success 'start is valid' '
21
+ git rev-parse start | grep "^[0-9a-f]\{40\}$"
22
+'
23
+
24
+test_expect_success 'start^0' '
25
+ test $(cat .git/refs/tags/start) = $(git rev-parse start^0)
26
+'
27
+
28
+test_expect_success 'start^1 not valid' '
29
+ if git rev-parse --verify start^1; then false; else :; fi
30
+'
31
+
32
+test_expect_success 'second^1 = second^' '
33
+ test $(git rev-parse second^1) = $(git rev-parse second^)
34
+'
35
+
36
+test_expect_success 'final^1^1^1' '
37
+ test $(git rev-parse start) = $(git rev-parse final^1^1^1)
38
+'
39
+
40
+test_expect_success 'final^1^1^1 = final^^^' '
41
+ test $(git rev-parse final^1^1^1) = $(git rev-parse final^^^)
42
+'
43
+
44
+test_expect_success 'final^1^2' '
45
+ test $(git rev-parse start2) = $(git rev-parse final^1^2)
46
+'
47
+
48
+test_expect_success 'final^1^2 != final^1^1' '
49
+ test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)
50
+'
51
+
52
+test_expect_success 'final^1^3 not valid' '
53
+ if git rev-parse --verify final^1^3; then false; else :; fi
54
+'
55
+
56
+test_expect_success '--verify start2^1' '
57
+ test_must_fail git rev-parse --verify start2^1
58
+'
59
+
60
+test_expect_success '--verify start2^0' '
61
+ git rev-parse --verify start2^0
62
+'
63
+
64
+test_expect_success 'final^1^@ = final^1^1 final^1^2' '
65
+ test "$(git rev-parse final^1^@)" = "$(git rev-parse final^1^1 final^1^2)"
66
+'
67
+
68
+test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' '
69
+ test "$(git rev-parse final^1^!)" = "$(git rev-parse final^1 ^final^1^1 ^final^1^2)"
70
+'
71
+
72
+test_expect_success 'repack for next test' '
73
+ git repack -a -d
74
+'
75
+
76
test_expect_success 'short SHA-1 works' '
77
start=`git rev-parse --verify start` &&
78
echo $start &&
@@ -39,6 +80,7 @@ test_expect_success 'short SHA-1 works' '
80
echo $abbrv &&
81
abbrv=`git rev-parse --verify $abbrv` &&
82
echo $abbrv &&
42
- test $start = $abbrv'
83
+ test $start = $abbrv
84
+'
85
86
test_done