Merge branch 'ms/send-email-validate-fix'

[thirdparty/git.git] / t / t7603-merge-reduce-heads.sh

diff --git a/t/t7603-merge-reduce-heads.sh b/t/t7603-merge-reduce-heads.sh
index 27cd94ad6f7770f93c84bad8a0a966e6d026ea78..0e85b21ec82cc64e7d1e519c269a9bdcb189e01b 100755 (executable)
--- a/t/t7603-merge-reduce-heads.sh
+++ b/t/t7603-merge-reduce-heads.sh
@@ -4,6 +4,7 @@ test_description='git merge
 
 Testing octopus merge when reducing parents to independent branches.'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # 0 - 1
@@ -95,7 +96,7 @@ test_expect_success 'setup' '
                echo $i > $i.c &&
                git add $i.c &&
                git commit -m $i &&
-               git tag $i
+               git tag $i || return 1
        done &&
        git reset --hard A &&
        for i in F G H I
@@ -103,7 +104,7 @@ test_expect_success 'setup' '
                echo $i > $i.c &&
                git add $i.c &&
                git commit -m $i &&
-               git tag $i
+               git tag $i || return 1
        done
 '