[PATCH] Add merge detection to git-cvsimport

[git.git] / t / t5400-send-pack.sh

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index a362c6e..2c142df 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -18,7 +18,7 @@ test_expect_success setup '
        do
            sleep 1 &&
            commit=$(echo "Commit #$i" | git-commit-tree $tree -p $parent) &&
-           parent=$commit || exit
+           parent=$commit || return 1
        done &&
        echo "$commit" >.git/HEAD &&
        git clone -l ./. victim &&
@@ -31,7 +31,7 @@ test_expect_success setup '
        do
            sleep 1 &&
            commit=$(echo "Rebase #$i" | git-commit-tree $tree -p $parent) &&
-           parent=$commit || exit
+           parent=$commit || return 1
        done &&
        echo "$commit" >.git/HEAD &&
        echo Rebase &&