From: Johannes Sixt <j6t@kdbg.org>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Nanako Shiraishi <nanako3@lavabit.com>,
git@vger.kernel.org
Subject: [PATCH 7/6] t0021: use $SHELL_PATH for the filter script
Date: Fri, 01 Jan 2010 23:14:06 +0100 [thread overview]
Message-ID: <4B3E73AE.6050003@kdbg.org> (raw)
In-Reply-To: <20091230110335.GF22959@coredump.intra.peff.net>
On Windows, we need the shbang line to correctly invoke shell scripts via
a POSIX shell, except when the script is invoked via 'sh -c' because
sh (a bash) does "the right thing". Since nowadays the clean and smudge
filters are not always invoked via 'sh -c' anymore, we have to mark the
the one in t0021-conversion with #!$SHELL_PATH.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
t/t0021-conversion.sh | 3 ++-
t/t4030-diff-textconv.sh | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index 8fc39d7..6cb8d60 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -4,7 +4,8 @@ test_description='blob conversion via gitattributes'
. ./test-lib.sh
-cat <<\EOF >rot13.sh
+cat <<EOF >rot13.sh
+#!$SHELL_PATH
tr \
'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' \
'nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM'
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh
index c16d538..3cb7e63 100755
--- a/t/t4030-diff-textconv.sh
+++ b/t/t4030-diff-textconv.sh
@@ -19,10 +19,12 @@ cat >expect.text <<'EOF'
+1
EOF
-cat >hexdump <<'EOF'
-#!/bin/sh
+{
+ echo "#!$SHELL_PATH"
+ cat <<'EOF'
perl -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1"
EOF
+} >hexdump
chmod +x hexdump
test_expect_success 'setup binary file with history' '
--
1.6.6.1073.gd853b.dirty
next prev parent reply other threads:[~2010-01-01 22:17 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-14 22:17 Giving command line parameter to textconv command? Nanako Shiraishi
2009-12-14 23:31 ` Junio C Hamano
2009-12-15 3:11 ` Nanako Shiraishi
2009-12-15 5:56 ` Junio C Hamano
2009-12-15 16:49 ` Jeff King
2009-12-16 1:05 ` Junio C Hamano
2009-12-16 1:13 ` Jeff King
2009-12-15 17:03 ` Jeff King
2009-12-15 17:23 ` Junio C Hamano
2009-12-30 3:13 ` Nanako Shiraishi
2009-12-30 8:05 ` Junio C Hamano
2009-12-30 9:56 ` Jeff King
2009-12-30 10:53 ` [PATCH 1/6] run-command: add "use shell" option Jeff King
2009-12-30 13:55 ` Erik Faye-Lund
2010-01-01 22:12 ` Johannes Sixt
2009-12-30 10:53 ` [PATCH 2/6] run-command: convert simple callsites to use_shell Jeff King
2009-12-30 10:55 ` [PATCH 3/6] run-command: optimize out useless shell calls Jeff King
2009-12-31 16:54 ` Johannes Sixt
2009-12-31 19:47 ` Junio C Hamano
2009-12-31 21:41 ` Johannes Sixt
2009-12-31 21:41 ` Jeff King
2009-12-31 22:16 ` Johannes Sixt
2010-01-01 4:50 ` Jeff King
2010-01-01 10:08 ` Johannes Sixt
2009-12-30 10:56 ` [PATCH 4/6] editor: use run_command's shell feature Jeff King
2009-12-30 11:01 ` [PATCH 5/6] textconv: use shell to run helper Jeff King
2009-12-30 11:03 ` [PATCH 6/6] diff: run external diff helper with shell Jeff King
2010-01-01 22:14 ` Johannes Sixt [this message]
2010-01-01 22:15 ` [PATCH 8/6] t4030, t4031: work around bogus MSYS bash path conversion Johannes Sixt
2010-01-03 7:24 ` [PATCH 7/6] t0021: use $SHELL_PATH for the filter script Jeff King
2010-01-04 15:50 ` Johannes Sixt
2010-01-04 16:03 ` Jeff King
2010-01-04 16:46 ` Johannes Sixt
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B3E73AE.6050003@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nanako3@lavabit.com \
--cc=peff@peff.net \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.