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

[thirdparty/git.git] / t / t3402-rebase-merge.sh

diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index cfde68f1939baeba49dc1b0d34d2c666042f9177..7e46f4ca850616b695cc6ffa061ca39ac404fb7d 100755 (executable)
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -68,7 +68,7 @@ test_expect_success 'merge and rebase should match' '
        if test -s difference
        then
                cat difference
-               (exit 1)
+               false
        else
                echo happy
        fi
@@ -102,7 +102,7 @@ test_expect_success 'merge and rebase should match' '
        if test -s difference
        then
                cat difference
-               (exit 1)
+               false
        else
                echo happy
        fi
@@ -117,7 +117,7 @@ test_expect_success 'picking rebase' '
                echo happy
        else
                git show-branch
-               (exit 1)
+               false
        fi &&
        f=$(git diff-tree --name-only HEAD^ HEAD) &&
        g=$(git diff-tree --name-only HEAD^^ HEAD^) &&
@@ -127,7 +127,7 @@ test_expect_success 'picking rebase' '
        *)
                echo "$f"
                echo "$g"
-               (exit 1)
+               false
        esac
 '