diff mbox series

[5/6] test: hack for zsh

Message ID 20230328173932.3614601-6-felipe.contreras@gmail.com (mailing list archive)
State New, archived
Headers show
Series test: make the test suite work with zsh | expand

Commit Message

Felipe Contreras March 28, 2023, 5:39 p.m. UTC 
See: https://www.zsh.org/mla/workers/2023/msg00336.html

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 t/t4046-diff-unmerged.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Felipe Contreras March 30, 2023, 8:15 a.m. UTC | #1 
On Tue, Mar 28, 2023 at 11:39 AM Felipe Contreras
<felipe.contreras@gmail.com> wrote:
>
> See: https://www.zsh.org/mla/workers/2023/msg00336.html

In case anyone is interested this has just been fixed:

https://github.com/zsh-users/zsh/commit/12e5db145b098a62ff11b88eea26f473ea2ecdcf
diff mbox series

Patch

diff --git a/t/t4046-diff-unmerged.sh b/t/t4046-diff-unmerged.sh
index 4998a1ce27..ca31771070 100755
--- a/t/t4046-diff-unmerged.sh
+++ b/t/t4046-diff-unmerged.sh
@@ -21,7 +21,8 @@  test_expect_success setup '
 			do
 				fpath="$b$o$t" &&
 				case "$fpath" in ooo) continue ;; esac &&
-				paths="$paths$fpath " &&
+				: hack for zsh &&
+				{ paths="$paths$fpath "; } &&
 				p="	$fpath" &&
 				case "$b" in x) echo "$m1$p" ;; esac &&
 				case "$o" in x) echo "$m2$p" ;; esac &&