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

[thirdparty/git.git] / t / t6430-merge-recursive.sh

diff --git a/t/t6430-merge-recursive.sh b/t/t6430-merge-recursive.sh
index a0efe7cb6dbe77215f0b2bd220f6974ad0c17ec0..07067bb347955b146b9654b353e9db2b8b2cd323 100755 (executable)
--- a/t/t6430-merge-recursive.sh
+++ b/t/t6430-merge-recursive.sh
@@ -706,7 +706,7 @@ test_expect_success 'merge-recursive remembers the names of all base trees' '
        # more trees than static slots used by oid_to_hex()
        for commit in $c0 $c2 $c4 $c5 $c6 $c7
        do
-               git rev-parse "$commit^{tree}"
+               git rev-parse "$commit^{tree}" || return 1
        done >trees &&
 
        # ignore the return code; it only fails because the input is weird...