From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jeff King <peff@peff.net>
Cc: Michael J Gruber <git@drmicha.warpmail.net>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] t9100: fix breakage when SHELL_PATH is not /bin/sh
Date: Mon, 8 Feb 2016 20:59:31 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.20.1602082056410.2964@virtualbox> (raw)
In-Reply-To: <20160208193509.GA30554@sigill.intra.peff.net>
Hi Peff,
On Mon, 8 Feb 2016, Jeff King wrote:
> On Mon, Feb 08, 2016 at 08:31:54PM +0100, Johannes Schindelin wrote:
>
> > On Mon, 8 Feb 2016, Jeff King wrote:
> >
> > > Assuming your patch works on Windows
> >
> > If it re-introduces that chmod +x, it won't.
> >
> > Please note that my *original* patch actually only guarded the chmod +x,
> > but Junio suggested switching to write_script and since it passed the test
> > suite here, I though it would be safe.
> >
> > I still think write_script is the better alternative.
>
> I'm confused why it matters. write_script() unconditionally calls "chmod
> +x", doesn't it?
Hmpf, you're right. I'll check tomorrow what's going wrong.
> I just double-checked its definition in test-lib-function.sh; am I
> missing some Windows-specific magic that kicks in?
No Windows magic I know of. But actually, the patch could be simplified to
-- snip --
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 56acc1e..ee85cc7 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -30,7 +30,7 @@ test_expect_success \
echo "deep dir" >dir/a/b/c/d/e/file &&
mkdir bar &&
echo "zzz" >bar/zzz &&
- write_script exec.sh </dev/null &&
+ write_script exec.sh /bin/sh </dev/null &&
svn_cmd import -m "import for git svn" . "$svnrepo" >/dev/null
) &&
rm -rf import &&
-- snap --
> > So why not just prefix it with `SHELL_PATH=/bin/sh`?
>
> But then what is write_script buying us?
write_script is a semantically unambiguous way to specify what we *want*.
And it would allow us to handle chmod specifically for Windows *in one
place only*.
But as I said, I have to investigate what's going on.
Ciao,
Dscho
next prev parent reply other threads:[~2016-02-08 19:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-07 19:11 [PATCH] t9100: fix breakage when SHELL_PATH is not /bin/sh Michael J Gruber
2016-02-08 13:50 ` Jeff King
2016-02-08 16:34 ` Michael J Gruber
[not found] ` <CAA19uiRSu_6Os3b498obSNec7b2uiYv20SZ=y93CkjsWqhqHzA@mail.gmail.com>
2016-02-08 16:37 ` Jeff King
2016-02-08 19:31 ` Johannes Schindelin
2016-02-08 19:35 ` Jeff King
2016-02-08 19:43 ` Junio C Hamano
2016-02-08 19:56 ` Jeff King
2016-02-09 10:00 ` Johannes Schindelin
2016-02-09 17:30 ` Junio C Hamano
2016-02-08 19:59 ` Johannes Schindelin [this message]
2016-02-08 20:12 ` Junio C Hamano
2016-02-09 10:07 ` Johannes Schindelin
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=alpine.DEB.2.20.1602082056410.2964@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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 NNTP newsgroup(s).