Merge branch 'sb/pack-protocol-mention-smart-http' into maint

diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 1176bcccf3b3f3708df04f49bfd084190cd27600..8d90634ab81b3d24326c519a8bae52c2e2cb3ac0 100755 (executable)
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -20,7 +20,7 @@ test_expect_success setup '
                echo $i >otherfile-$i &&
                git add otherfile-$i &&
                test_tick &&
-               git commit -a -m $i || break
+               git commit -a -m $i || return 1
        done &&
        git format-patch --no-numbered initial &&
        git checkout -b side initial &&