t6022 (renaming merge): chain test commands with &&

Using 'return' in an attempt to end a test assertion can have
unpredictable results (probably escaping from test_run_ and breaking
its bookkeeping).  Redo the control flow using helpers like
test_expect_code and git diff --exit-code, so each test assertion can
follow the usual form

command that should succeed &&
command that should succeed &&
command that should succeed &&
...

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index b66544b76d545a396ef068438f3980b3f544efdd..83efc7abf5f15c9a5603107f2223454cd32f9abc 100755 (executable)
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -94,245 +94,147 @@ git checkout master'
 
 test_expect_success 'pull renaming branch into unrenaming one' \
 '
 
 test_expect_success 'pull renaming branch into unrenaming one' \
 '

-       git show-branch
-       git pull . white && {
-               echo "BAD: should have conflicted"
-               return 1
-       }
-       git ls-files -s
-       test "$(git ls-files -u B | wc -l)" -eq 3 || {
-               echo "BAD: should have left stages for B"
-               return 1
-       }
-       test "$(git ls-files -s N | wc -l)" -eq 1 || {
-               echo "BAD: should have merged N"
-               return 1
-       }
+       git show-branch &&
+       test_expect_code 1 git pull . white &&
+       git ls-files -s &&
+       git ls-files -u B >b.stages &&
+       test_line_count = 3 b.stages &&
+       git ls-files -s N >n.stages &&
+       test_line_count = 1 n.stages &&

        sed -ne "/^g/{
        p
        q
        sed -ne "/^g/{
        p
        q

-       }" B | grep master || {
-               echo "BAD: should have listed our change first"
-               return 1
-       }
-       test "$(git diff white N | wc -l)" -eq 0 || {
-               echo "BAD: should have taken colored branch"
-               return 1
-       }
+       }" B | grep master &&
+       git diff --exit-code white N

 '
 
 test_expect_success 'pull renaming branch into another renaming one' \
 '
 '
 
 test_expect_success 'pull renaming branch into another renaming one' \
 '

-       rm -f B
-       git reset --hard
-       git checkout red
-       git pull . white && {
-               echo "BAD: should have conflicted"
-               return 1
-       }
-       test "$(git ls-files -u B | wc -l)" -eq 3 || {
-               echo "BAD: should have left stages"
-               return 1
-       }
-       test "$(git ls-files -s N | wc -l)" -eq 1 || {
-               echo "BAD: should have merged N"
-               return 1
-       }
+       rm -f B &&
+       git reset --hard &&
+       git checkout red &&
+       test_expect_code 1 git pull . white &&
+       git ls-files -u B >b.stages &&
+       test_line_count = 3 b.stages &&
+       git ls-files -s N >n.stages &&
+       test_line_count = 1 n.stages &&

        sed -ne "/^g/{
        p
        q
        sed -ne "/^g/{
        p
        q

-       }" B | grep red || {
-               echo "BAD: should have listed our change first"
-               return 1
-       }
-       test "$(git diff white N | wc -l)" -eq 0 || {
-               echo "BAD: should have taken colored branch"
-               return 1
-       }
+       }" B | grep red &&
+       git diff --exit-code white N

 '
 
 test_expect_success 'pull unrenaming branch into renaming one' \
 '
 '
 
 test_expect_success 'pull unrenaming branch into renaming one' \
 '

-       git reset --hard
-       git show-branch
-       git pull . master && {
-               echo "BAD: should have conflicted"
-               return 1
-       }
-       test "$(git ls-files -u B | wc -l)" -eq 3 || {
-               echo "BAD: should have left stages"
-               return 1
-       }
-       test "$(git ls-files -s N | wc -l)" -eq 1 || {
-               echo "BAD: should have merged N"
-               return 1
-       }
+       git reset --hard &&
+       git show-branch &&
+       test_expect_code 1 git pull . master &&
+       git ls-files -u B >b.stages &&
+       test_line_count = 3 b.stages &&
+       git ls-files -s N >n.stages &&
+       test_line_count = 1 n.stages &&

        sed -ne "/^g/{
        p
        q
        sed -ne "/^g/{
        p
        q

-       }" B | grep red || {
-               echo "BAD: should have listed our change first"
-               return 1
-       }
-       test "$(git diff white N | wc -l)" -eq 0 || {
-               echo "BAD: should have taken colored branch"
-               return 1
-       }
+       }" B | grep red &&
+       git diff --exit-code white N

 '
 
 test_expect_success 'pull conflicting renames' \
 '
 '
 
 test_expect_success 'pull conflicting renames' \
 '

-       git reset --hard
-       git show-branch
-       git pull . blue && {
-               echo "BAD: should have conflicted"
-               return 1
-       }
-       test "$(git ls-files -u A | wc -l)" -eq 1 || {
-               echo "BAD: should have left a stage"
-               return 1
-       }
-       test "$(git ls-files -u B | wc -l)" -eq 1 || {
-               echo "BAD: should have left a stage"
-               return 1
-       }
-       test "$(git ls-files -u C | wc -l)" -eq 1 || {
-               echo "BAD: should have left a stage"
-               return 1
-       }
-       test "$(git ls-files -s N | wc -l)" -eq 1 || {
-               echo "BAD: should have merged N"
-               return 1
-       }
+       git reset --hard &&
+       git show-branch &&
+       test_expect_code 1 git pull . blue &&
+       git ls-files -u A >a.stages &&
+       test_line_count = 1 a.stages &&
+       git ls-files -u B >b.stages &&
+       test_line_count = 1 b.stages &&
+       git ls-files -u C >c.stages &&
+       test_line_count = 1 c.stages &&
+       git ls-files -s N >n.stages &&
+       test_line_count = 1 n.stages &&

        sed -ne "/^g/{
        p
        q
        sed -ne "/^g/{
        p
        q

-       }" B | grep red || {
-               echo "BAD: should have listed our change first"
-               return 1
-       }
-       test "$(git diff white N | wc -l)" -eq 0 || {
-               echo "BAD: should have taken colored branch"
-               return 1
-       }
+       }" B | grep red &&
+       git diff --exit-code white N

 '
 
 test_expect_success 'interference with untracked working tree file' '
 '
 
 test_expect_success 'interference with untracked working tree file' '

-
-       git reset --hard
-       git show-branch
-       echo >A this file should not matter
-       git pull . white && {
-               echo "BAD: should have conflicted"
-               return 1
-       }
-       test -f A || {
-               echo "BAD: should have left A intact"
-               return 1
-       }
+       git reset --hard &&
+       git show-branch &&
+       echo >A this file should not matter &&
+       test_expect_code 1 git pull . white &&
+       test_path_is_file A

 '
 
 test_expect_success 'interference with untracked working tree file' '
 '
 
 test_expect_success 'interference with untracked working tree file' '

-
-       git reset --hard
-       git checkout white
-       git show-branch
-       rm -f A
-       echo >A this file should not matter
-       git pull . red && {
-               echo "BAD: should have conflicted"
-               return 1
-       }
-       test -f A || {
-               echo "BAD: should have left A intact"
-               return 1
-       }
+       git reset --hard &&
+       git checkout white &&
+       git show-branch &&
+       rm -f A &&
+       echo >A this file should not matter &&
+       test_expect_code 1 git pull . red &&
+       test_path_is_file A

 '
 
 test_expect_success 'interference with untracked working tree file' '
 '
 
 test_expect_success 'interference with untracked working tree file' '

-
-       git reset --hard
-       rm -f A M
-       git checkout -f master
-       git tag -f anchor
-       git show-branch
-       git pull . yellow || {
-               echo "BAD: should have cleanly merged"
-               return 1
-       }
-       test -f M && {
-               echo "BAD: should have removed M"
-               return 1
-       }
+       git reset --hard &&
+       rm -f A M &&
+       git checkout -f master &&
+       git tag -f anchor &&
+       git show-branch &&
+       git pull . yellow &&
+       test_path_is_missing M &&

        git reset --hard anchor
 '
 
 test_expect_success 'updated working tree file should prevent the merge' '
        git reset --hard anchor
 '
 
 test_expect_success 'updated working tree file should prevent the merge' '

-
-       git reset --hard
-       rm -f A M
-       git checkout -f master
-       git tag -f anchor
-       git show-branch
-       echo >>M one line addition
-       cat M >M.saved
-       git pull . yellow && {
-               echo "BAD: should have complained"
-               return 1
-       }
-       test_cmp M M.saved || {
-               echo "BAD: should have left M intact"
-               return 1
-       }
+       git reset --hard &&
+       rm -f A M &&
+       git checkout -f master &&
+       git tag -f anchor &&
+       git show-branch &&
+       echo >>M one line addition &&
+       cat M >M.saved &&
+       test_expect_code 128 git pull . yellow &&
+       test_cmp M M.saved &&

        rm -f M.saved
 '
 
 test_expect_success 'updated working tree file should prevent the merge' '
        rm -f M.saved
 '
 
 test_expect_success 'updated working tree file should prevent the merge' '

-
-       git reset --hard
-       rm -f A M
-       git checkout -f master
-       git tag -f anchor
-       git show-branch
-       echo >>M one line addition
-       cat M >M.saved
-       git update-index M
-       git pull . yellow && {
-               echo "BAD: should have complained"
-               return 1
-       }
-       test_cmp M M.saved || {
-               echo "BAD: should have left M intact"
-               return 1
-       }
+       git reset --hard &&
+       rm -f A M &&
+       git checkout -f master &&
+       git tag -f anchor &&
+       git show-branch &&
+       echo >>M one line addition &&
+       cat M >M.saved &&
+       git update-index M &&
+       test_expect_code 128 git pull . yellow &&
+       test_cmp M M.saved &&

        rm -f M.saved
 '
 
 test_expect_success 'interference with untracked working tree file' '
        rm -f M.saved
 '
 
 test_expect_success 'interference with untracked working tree file' '

-
-       git reset --hard
-       rm -f A M
-       git checkout -f yellow
-       git tag -f anchor
-       git show-branch
-       echo >M this file should not matter
-       git pull . master || {
-               echo "BAD: should have cleanly merged"
-               return 1
-       }
-       test -f M || {
-               echo "BAD: should have left M intact"
-               return 1
-       }
-       git ls-files -s | grep M && {
-               echo "BAD: M must be untracked in the result"
-               return 1
-       }
+       git reset --hard &&
+       rm -f A M &&
+       git checkout -f yellow &&
+       git tag -f anchor &&
+       git show-branch &&
+       echo >M this file should not matter &&
+       git pull . master &&
+       test_path_is_file M &&
+       ! {
+               git ls-files -s |
+               grep M
+       } &&

        git reset --hard anchor
 '
 
 test_expect_success 'merge of identical changes in a renamed file' '
        git reset --hard anchor
 '
 
 test_expect_success 'merge of identical changes in a renamed file' '

-       rm -f A M N
+       rm -f A M N &&

        git reset --hard &&
        git checkout change+rename &&
        GIT_MERGE_VERBOSITY=3 git merge change | grep "^Skipped B" &&
        git reset --hard &&
        git checkout change+rename &&
        GIT_MERGE_VERBOSITY=3 git merge change | grep "^Skipped B" &&