t4046: avoid continue in &&-chain for zsh

zsh has a bug in which the keyword "continue" within an &&-chain is not
effective and the code following it is executed nonetheless.
Fortunately, this bug has been fixed upstream in 12e5db145 ("51608:
Don't execute commands after "continue &&"", 2023-03-29).  However, zsh
releases very infrequently, so it is not present in a stable release
yet.

That, combined with the fact that almost all zsh users get their shell
from their OS vendor, means that it will likely be a long time before
this problem is fixed for most users.  We have other workarounds in
place for FreeBSD ash and dash, so it shouldn't be too difficult to add
one here, either.

Replace the existing code with a test and if-block, which comes only at
the cost of an additional indentation, and leaves the code a little more
idiomatic anyway.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4046-diff-unmerged.sh b/t/t4046-diff-unmerged.sh
index ffaf69335f7b224f76ece7228435a4ce057e5c83..fb8c51746e8c9cd5d81f04853030e7d8895fd25a 100755 (executable)
--- a/t/t4046-diff-unmerged.sh
+++ b/t/t4046-diff-unmerged.sh
@@ -20,13 +20,15 @@ test_expect_success setup '
                        for t in o x
                        do
                                path="$b$o$t" &&
-                               case "$path" in ooo) continue ;; esac &&
-                               paths="$paths$path " &&
-                               p="     $path" &&
-                               case "$b" in x) echo "$m1$p" ;; esac &&
-                               case "$o" in x) echo "$m2$p" ;; esac &&
-                               case "$t" in x) echo "$m3$p" ;; esac ||
-                               return 1
+                               if test "$path" != ooo
+                               then
+                                       paths="$paths$path " &&
+                                       p="     $path" &&
+                                       case "$b" in x) echo "$m1$p" ;; esac &&
+                                       case "$o" in x) echo "$m2$p" ;; esac &&
+                                       case "$t" in x) echo "$m3$p" ;; esac ||
+                                       return 1
+                               fi
                        done
                done
        done >ls-files-s.expect &&