From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH 5/6] test: hack for zsh
Date: Tue, 28 Mar 2023 11:39:31 -0600 [thread overview]
Message-ID: <20230328173932.3614601-6-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20230328173932.3614601-1-felipe.contreras@gmail.com>
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(-)
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 &&
--
2.39.2.13.g1fb56cf030
next prev parent reply other threads:[~2023-03-28 17:40 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-28 17:39 [PATCH 0/6] test: make the test suite work with zsh Felipe Contreras
2023-03-28 17:39 ` [PATCH 1/6] test: fix build for zsh Felipe Contreras
2023-03-28 17:39 ` [PATCH 2/6] test: avoid `stat` variable Felipe Contreras
2023-03-29 9:48 ` Ævar Arnfjörð Bjarmason
2023-04-01 0:05 ` Taylor Blau
2023-04-01 0:25 ` Felipe Contreras
2023-03-28 17:39 ` [PATCH 3/6] test: avoid `options` variable Felipe Contreras
2023-03-28 17:39 ` [PATCH 4/6] test: avoid `path` variable Felipe Contreras
2023-03-28 17:39 ` Felipe Contreras [this message]
2023-03-30 8:15 ` [PATCH 5/6] test: hack for zsh Felipe Contreras
2023-03-28 17:39 ` [PATCH 6/6] mergetools: vimdiff: check for empty fields Felipe Contreras
2023-03-29 0:57 ` [PATCH 0/6] test: make the test suite work with zsh brian m. carlson
2023-03-29 1:57 ` Felipe Contreras
2023-03-29 9:51 ` Ævar Arnfjörð Bjarmason
2023-03-29 11:19 ` Felipe Contreras
2023-03-30 13:00 ` Felipe Contreras
2023-03-29 15:34 ` Junio C Hamano
2023-03-29 21:54 ` Felipe Contreras
2023-03-30 10:15 ` Junio C Hamano
2023-03-30 14:19 ` Felipe Contreras
2023-04-01 0:04 ` Taylor Blau
2023-04-01 0:59 ` Felipe Contreras
2023-04-01 1:30 ` Junio C Hamano
2023-04-01 2:39 ` Felipe Contreras
2023-04-01 0:00 ` Taylor Blau
2023-04-01 0:50 ` Felipe Contreras
2023-03-29 22:14 ` brian m. carlson
2023-03-30 3:15 ` Junio C Hamano
2023-03-30 7:47 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230328173932.3614601-6-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).