Merge branch 'va/fix-git-p4-tests'

diff --git a/t/t3202-show-branch-octopus.sh b/t/t3202-show-branch-octopus.sh
index 0a5d5e669fac2e3be513df4f27c1f0a6560796db..6adf47869c468a98ce41bc3dd1396b81dc50af3f 100755 (executable)
--- a/t/t3202-show-branch-octopus.sh
+++ b/t/t3202-show-branch-octopus.sh
@@ -19,7 +19,7 @@ test_expect_success 'setup' '
                > file$i &&
                git add file$i &&
                test_tick &&
-               git commit -m branch$i || break
+               git commit -m branch$i || return 1
        done
 
 '