Merge branch 'mh/multimail-renewal'

diff --git a/t/t4046-diff-unmerged.sh b/t/t4046-diff-unmerged.sh
index 25d50a654a8904396cfc0078745dd45034aacce2..d0f14475ca99b596fbe4addb4f8c543d07944ea5 100755 (executable)
--- a/t/t4046-diff-unmerged.sh
+++ b/t/t4046-diff-unmerged.sh
@@ -8,7 +8,7 @@ test_expect_success setup '
        do
                blob=$(echo $i | git hash-object --stdin) &&
                eval "blob$i=$blob" &&
-               eval "m$i=\"100644 \$blob$i $i\"" || break
+               eval "m$i=\"100644 \$blob$i $i\"" || return 1
        done &&
        paths= &&
        for b in o x
@@ -24,9 +24,9 @@ test_expect_success setup '
                                case "$b" in x) echo "$m1$p" ;; esac &&
                                case "$o" in x) echo "$m2$p" ;; esac &&
                                case "$t" in x) echo "$m3$p" ;; esac ||
-                               break
-                       done || break
-               done || break
+                               return 1
+                       done
+               done
        done >ls-files-s.expect &&
        git update-index --index-info <ls-files-s.expect &&
        git ls-files -s >ls-files-s.actual &&