t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
Also, replace "|| return 1" with "&&" in order to keep commands chained. 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
315e76540baa8b2c1887ea1ee0827dcbcda3e267
2 files changed
+14
-14
t/t1001-read-tree-m-2way.sh
+9
-9
@@ -98,8 +98,8 @@ test_expect_success \
98
git checkout-index -u -f -q -a &&
99
git update-index --add yomin &&
100
read_tree_twoway $treeH $treeM &&
101
- git ls-files --stage >4.out || return 1
102
- git diff --no-index M.out 4.out >4diff.out
101
+ git ls-files --stage >4.out &&
102
+ test_must_fail git diff --no-index M.out 4.out >4diff.out &&
103
compare_change 4diff.out expected &&
104
check_cache_at yomin clean'
105
@@ -112,8 +112,8 @@ test_expect_success \
112
git update-index --add yomin &&
113
echo yomin yomin >yomin &&
114
read_tree_twoway $treeH $treeM &&
115
- git ls-files --stage >5.out || return 1
116
- git diff --no-index M.out 5.out >5diff.out
115
+ git ls-files --stage >5.out &&
116
+ test_must_fail git diff --no-index M.out 5.out >5diff.out &&
117
compare_change 5diff.out expected &&
118
check_cache_at yomin dirty'
119
@@ -213,8 +213,8 @@ test_expect_success \
213
echo nitfol nitfol >nitfol &&
214
git update-index --add nitfol &&
215
read_tree_twoway $treeH $treeM &&
216
- git ls-files --stage >14.out || return 1
217
- git diff --no-index M.out 14.out >14diff.out
216
+ git ls-files --stage >14.out &&
217
+ test_must_fail git diff --no-index M.out 14.out >14diff.out &&
218
compare_change 14diff.out expected &&
219
check_cache_at nitfol clean'
220
@@ -227,8 +227,8 @@ test_expect_success \
227
git update-index --add nitfol &&
228
echo nitfol nitfol nitfol >nitfol &&
229
read_tree_twoway $treeH $treeM &&
230
- git ls-files --stage >15.out || return 1
231
- git diff --no-index M.out 15.out >15diff.out
230
+ git ls-files --stage >15.out &&
231
+ test_must_fail git diff --no-index M.out 15.out >15diff.out &&
232
compare_change 15diff.out expected &&
233
check_cache_at nitfol dirty'
234
@@ -377,7 +377,7 @@ test_expect_success \
377
git ls-files --stage >treeM.out &&
378
379
rm -f a &&
380
- mkdir a
380
+ mkdir a &&
381
: >a/b &&
382
git update-index --add --remove a a/b &&
383
treeH=`git write-tree` &&
t/t1002-read-tree-m-u-2way.sh
+5
-5
@@ -205,8 +205,8 @@ test_expect_success \
205
echo nitfol nitfol >nitfol &&
206
git update-index --add nitfol &&
207
git read-tree -m -u $treeH $treeM &&
208
- git ls-files --stage >14.out || return 1
209
- git diff -U0 --no-index M.out 14.out >14diff.out
208
+ git ls-files --stage >14.out &&
209
+ test_must_fail git diff -U0 --no-index M.out 14.out >14diff.out &&
210
compare_change 14diff.out expected &&
211
sum bozbar frotz >actual14.sum &&
212
grep -v nitfol M.sum > expected14.sum &&
@@ -226,8 +226,8 @@ test_expect_success \
226
git update-index --add nitfol &&
227
echo nitfol nitfol nitfol >nitfol &&
228
git read-tree -m -u $treeH $treeM &&
229
- git ls-files --stage >15.out || return 1
230
- git diff -U0 --no-index M.out 15.out >15diff.out
229
+ git ls-files --stage >15.out &&
230
+ test_must_fail git diff -U0 --no-index M.out 15.out >15diff.out &&
231
compare_change 15diff.out expected &&
232
check_cache_at nitfol dirty &&
233
sum bozbar frotz >actual15.sum &&
@@ -314,7 +314,7 @@ test_expect_success \
314
# Also make sure we did not break DF vs DF/DF case.
315
test_expect_success \
316
'DF vs DF/DF case setup.' \
317
- 'rm -f .git/index
317
+ 'rm -f .git/index &&
318
echo DF >DF &&
319
git update-index --add DF &&
320
treeDF=`git write-tree` &&