t6000-t9999: detect and signal failure within loop

[thirdparty/git.git] / t / t7602-merge-octopus-many.sh

diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index ddf64dc5f75e7cc3524dffc2cedcb6a8b49230c0..ff085b086cc38f36a180e22ab02bbea12a29cc0c 100755 (executable)
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -30,7 +30,7 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' '
        while test $i -le 30
        do
                refs="$refs c$i" &&
-               i=$(expr $i + 1)
+               i=$(expr $i + 1) || return 1
        done &&
        git merge $refs &&
        test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&