Merge branch 'en/fetch-negotiation-default-fix'

[thirdparty/git.git] / t / t4057-diff-combined-paths.sh

diff --git a/t/t4057-diff-combined-paths.sh b/t/t4057-diff-combined-paths.sh
index 7e5b74f72ee975ef87c8d5e539bc287268e18493..04b8a1542a8ec3ad2ffc28964f21940d034c2ed6 100755 (executable)
--- a/t/t4057-diff-combined-paths.sh
+++ b/t/t4057-diff-combined-paths.sh
@@ -18,13 +18,13 @@ test_expect_success 'trivial merge - combine-diff empty' '
        for i in $(test_seq 1 9)
        do
                echo $i >$i.txt &&
-               git add $i.txt
+               git add $i.txt || return 1
        done &&
        git commit -m "init" &&
        git checkout -b side &&
        for i in $(test_seq 2 9)
        do
-               echo $i/2 >>$i.txt
+               echo $i/2 >>$i.txt || return 1
        done &&
        git commit -a -m "side 2-9" &&
        git checkout main &&
@@ -40,14 +40,14 @@ test_expect_success 'only one truly conflicting path' '
        git checkout side &&
        for i in $(test_seq 2 9)
        do
-               echo $i/3 >>$i.txt
+               echo $i/3 >>$i.txt || return 1
        done &&
        echo "4side" >>4.txt &&
        git commit -a -m "side 2-9 +4" &&
        git checkout main &&
        for i in $(test_seq 1 9)
        do
-               echo $i/3 >>$i.txt
+               echo $i/3 >>$i.txt || return 1
        done &&
        echo "4main" >>4.txt &&
        git commit -a -m "main 1-9 +4" &&
@@ -69,13 +69,13 @@ test_expect_success 'merge introduces new file' '
        git checkout side &&
        for i in $(test_seq 5 9)
        do
-               echo $i/4 >>$i.txt
+               echo $i/4 >>$i.txt || return 1
        done &&
        git commit -a -m "side 5-9" &&
        git checkout main &&
        for i in $(test_seq 1 3)
        do
-               echo $i/4 >>$i.txt
+               echo $i/4 >>$i.txt || return 1
        done &&
        git commit -a -m "main 1-3 +4hello" &&
        git merge side &&
@@ -90,13 +90,13 @@ test_expect_success 'merge removed a file' '
        git checkout side &&
        for i in $(test_seq 5 9)
        do
-               echo $i/5 >>$i.txt
+               echo $i/5 >>$i.txt || return 1
        done &&
        git commit -a -m "side 5-9" &&
        git checkout main &&
        for i in $(test_seq 1 3)
        do
-               echo $i/4 >>$i.txt
+               echo $i/4 >>$i.txt || return 1
        done &&
        git commit -a -m "main 1-3" &&
        git merge side &&