Elijah Newren <newren@xxxxxxxxx> writes: > Also, replace "|| return 1" with "&&" in order to keep commands chained. > > Acked-by: Ãvar ArnfjÃrà Bjarmason <avarab@xxxxxxxxx> > Signed-off-by: Elijah Newren <newren@xxxxxxxxx> > --- > t/t1001-read-tree-m-2way.sh | 18 +++++++++--------- > t/t1002-read-tree-m-u-2way.sh | 10 +++++----- > 2 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh > index 93ca84f..ce8112c 100755 > --- a/t/t1001-read-tree-m-2way.sh > +++ b/t/t1001-read-tree-m-2way.sh > @@ -98,8 +98,8 @@ test_expect_success \ > git checkout-index -u -f -q -a && > git update-index --add yomin && > read_tree_twoway $treeH $treeM && > - git ls-files --stage >4.out || return 1 > - git diff --no-index M.out 4.out >4diff.out > + git ls-files --stage >4.out && > + test_might_fail git diff --no-index M.out 4.out >4diff.out && Shouldn't this be must-fail, as we are expecting to see some differences? > compare_change 4diff.out expected && > check_cache_at yomin clean' > > @@ -112,8 +112,8 @@ test_expect_success \ > git update-index --add yomin && > echo yomin yomin >yomin && > read_tree_twoway $treeH $treeM && > - git ls-files --stage >5.out || return 1 > - git diff --no-index M.out 5.out >5diff.out > + git ls-files --stage >5.out && > + test_might_fail git diff --no-index M.out 5.out >5diff.out && Ditto. > compare_change 5diff.out expected && > check_cache_at yomin dirty' > > @@ -213,8 +213,8 @@ test_expect_success \ > echo nitfol nitfol >nitfol && > git update-index --add nitfol && > read_tree_twoway $treeH $treeM && > - git ls-files --stage >14.out || return 1 > - git diff --no-index M.out 14.out >14diff.out > + git ls-files --stage >14.out && > + test_might_fail git diff --no-index M.out 14.out >14diff.out && Ditto. > compare_change 14diff.out expected && > check_cache_at nitfol clean' > > @@ -227,8 +227,8 @@ test_expect_success \ > git update-index --add nitfol && > echo nitfol nitfol nitfol >nitfol && > read_tree_twoway $treeH $treeM && > - git ls-files --stage >15.out || return 1 > - git diff --no-index M.out 15.out >15diff.out > + git ls-files --stage >15.out && > + test_might_fail git diff --no-index M.out 15.out >15diff.out && Ditto. > compare_change 15diff.out expected && > check_cache_at nitfol dirty' > > @@ -377,7 +377,7 @@ test_expect_success \ > git ls-files --stage >treeM.out && > > rm -f a && > - mkdir a > + mkdir a && > : >a/b && > git update-index --add --remove a a/b && > treeH=`git write-tree` && > diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh > index 0241329..a9492e9 100755 > --- a/t/t1002-read-tree-m-u-2way.sh > +++ b/t/t1002-read-tree-m-u-2way.sh > @@ -205,8 +205,8 @@ test_expect_success \ > echo nitfol nitfol >nitfol && > git update-index --add nitfol && > git read-tree -m -u $treeH $treeM && > - git ls-files --stage >14.out || return 1 > - git diff -U0 --no-index M.out 14.out >14diff.out > + git ls-files --stage >14.out && > + test_might_fail git diff -U0 --no-index M.out 14.out >14diff.out && Ditto. > compare_change 14diff.out expected && > sum bozbar frotz >actual14.sum && > grep -v nitfol M.sum > expected14.sum && > @@ -226,8 +226,8 @@ test_expect_success \ > git update-index --add nitfol && > echo nitfol nitfol nitfol >nitfol && > git read-tree -m -u $treeH $treeM && > - git ls-files --stage >15.out || return 1 > - git diff -U0 --no-index M.out 15.out >15diff.out > + git ls-files --stage >15.out && > + test_might_fail git diff -U0 --no-index M.out 15.out >15diff.out && Ditto. > compare_change 15diff.out expected && > check_cache_at nitfol dirty && > sum bozbar frotz >actual15.sum && > @@ -314,7 +314,7 @@ test_expect_success \ > # Also make sure we did not break DF vs DF/DF case. > test_expect_success \ > 'DF vs DF/DF case setup.' \ > - 'rm -f .git/index > + 'rm -f .git/index && > echo DF >DF && > git update-index --add DF && > treeDF=`git write-tree` && > -- > 1.7.3.95.g14291 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html