t6016 (rev-list-graph-simplify-history): add missing &&
Also move repeated tag and branch deletions into a separate setup test, to avoid failures from tags and branches having already been deleted. Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Oct 3, 2010 at 14:00 UTC
e6f68a2e746405c1aa72f12a030de1485dff3dab
1 file changed
+10
-19
t/t6016-rev-list-graph-simplify-history.sh
+10
-19
@@ -29,7 +29,7 @@ test_expect_success 'set up rev-list --graph test' '
29
# Octopus merge B and C into branch A
30
git checkout A &&
31
git merge B C &&
32
- git tag A4
32
+ git tag A4 &&
33
34
test_commit A5 bar.txt &&
35
@@ -39,7 +39,7 @@ test_expect_success 'set up rev-list --graph test' '
39
test_commit C4 bar.txt &&
40
git checkout A &&
41
git merge -s ours C &&
42
- git tag A6
42
+ git tag A6 &&
43
44
test_commit A7 bar.txt &&
45
@@ -90,7 +90,7 @@ test_expect_success '--graph --all' '
90
# that undecorated merges are interesting, even with --simplify-by-decoration
91
test_expect_success '--graph --simplify-by-decoration' '
92
rm -f expected &&
93
- git tag -d A4
93
+ git tag -d A4 &&
94
echo "* $A7" >> expected &&
95
echo "* $A6" >> expected &&
96
echo "|\\ " >> expected &&
@@ -116,12 +116,15 @@ test_expect_success '--graph --simplify-by-decoration' '
116
test_cmp expected actual
117
'
118
119
-# Get rid of all decorations on branch B, and graph with it simplified away
119
+test_expect_success 'setup: get rid of decorations on B' '
120
+ git tag -d B2 &&
121
+ git tag -d B1 &&
122
+ git branch -d B
123
+'
124
+
125
+# Graph with branch B simplified away
126
test_expect_success '--graph --simplify-by-decoration prune branch B' '
127
rm -f expected &&
122
- git tag -d B2
123
- git tag -d B1
124
- git branch -d B
128
echo "* $A7" >> expected &&
129
echo "* $A6" >> expected &&
130
echo "|\\ " >> expected &&
@@ -143,9 +146,6 @@ test_expect_success '--graph --simplify-by-decoration prune branch B' '
146
147
test_expect_success '--graph --full-history -- bar.txt' '
148
rm -f expected &&
146
- git tag -d B2
147
- git tag -d B1
148
- git branch -d B
149
echo "* $A7" >> expected &&
150
echo "* $A6" >> expected &&
151
echo "|\\ " >> expected &&
@@ -163,9 +163,6 @@ test_expect_success '--graph --full-history -- bar.txt' '
163
164
test_expect_success '--graph --full-history --simplify-merges -- bar.txt' '
165
rm -f expected &&
166
- git tag -d B2
167
- git tag -d B1
168
- git branch -d B
166
echo "* $A7" >> expected &&
167
echo "* $A6" >> expected &&
168
echo "|\\ " >> expected &&
@@ -181,9 +178,6 @@ test_expect_success '--graph --full-history --simplify-merges -- bar.txt' '
178
179
test_expect_success '--graph -- bar.txt' '
180
rm -f expected &&
184
- git tag -d B2
185
- git tag -d B1
186
- git branch -d B
181
echo "* $A7" >> expected &&
182
echo "* $A5" >> expected &&
183
echo "* $A3" >> expected &&
@@ -196,9 +190,6 @@ test_expect_success '--graph -- bar.txt' '
190
191
test_expect_success '--graph --sparse -- bar.txt' '
192
rm -f expected &&
199
- git tag -d B2
200
- git tag -d B1
201
- git branch -d B
193
echo "* $A7" >> expected &&
194
echo "* $A6" >> expected &&
195
echo "* $A5" >> expected &&