From: Ben Walton <bwalton@artsci.utoronto.ca>
To: gitster@pobox.com, peff@peff.net
Cc: git@vger.kernel.org, Ben Walton <bwalton@artsci.utoronto.ca>
Subject: [PATCH 0/2] Make run-command.c honour SHELL_PATH
Date: Sun, 25 Mar 2012 08:31:34 -0400 [thread overview]
Message-ID: <1332678696-4001-1-git-send-email-bwalton@artsci.utoronto.ca> (raw)
Hi Jeff and Junio,
[Others touched this file too, but it appears Jeff wrote the affected
functionality.]
I hit a glitch with t7006-pager while testing the 1.7.10 rc1/rc2
builds for OpenCSW/Solaris that turned out to be a problem with the
way run-command.c:prepare_shell_cmd was setting up external
utilities. It was hard coded to fork 'sh -c' instead of honouring the
SHELL_PATH as set at build time.
In this case, the failing test was t7006-pager:command-specific
pager. That test (and some subsequent ones) were setting the pager
command used by git log to "sed s/^/foo:/ >actual" which is fine in a
POSIX-compliant sh, but not in Solaris' sh. If the user PATH at
runtime happened to allow the broken system sh used instead of a sane
sh, the ^ is interpreted the same as[1] | and this caused sed to fail
with incomplete s/ command and a "command not found: /foo:" from the
other forked process.
To mitigate this, the following patches introduce the macro SHELL_PATH
for use in run-command.c, defaulting to "sh" to preserve the current
behaviour and then cause the build system to provide the SHELL_PATH as
set by the builder. This means that all processed forked by
run-command will use the same interpreter as the shell scripts in the
git suite.
I considered implementing a dynamically generated .h file for this,
similar to common-cmds.h, but thought that was overkill at the current
time. If you think that (or something else) is a better fit for the
change, let me know and I'll make the required adjustments.
Thanks
-Ben
[1] http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/cmd/sh/cmd.c#184
Ben Walton (2):
run-command.c: Define SHELL_PATH macro for use in prepare_shell_cmd
Makefile: Set EXTRA_CPPFLAGS during the compilation of run-command
Makefile | 2 ++
run-command.c | 6 +++++-
2 files changed, 7 insertions(+), 1 deletions(-)
--
1.7.5.4
next reply other threads:[~2012-03-25 12:31 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-25 12:31 Ben Walton [this message]
2012-03-25 12:31 ` [PATCH 1/2] run-command.c: Define SHELL_PATH macro for use in prepare_shell_cmd Ben Walton
2012-03-25 12:31 ` [PATCH 2/2] Makefile: Set EXTRA_CPPFLAGS during the compilation of run-command Ben Walton
2012-03-26 1:11 ` [PATCH 0/2] Make run-command.c honour SHELL_PATH Jonathan Nieder
2012-03-26 13:38 ` Ben Walton
2012-03-26 18:12 ` Jeff King
2012-03-26 18:19 ` Ben Walton
2012-03-26 18:24 ` Jeff King
2012-03-27 2:41 ` [PATCH] Use SHELL_PATH to fork commands in run_command.c:prepare_shell_cmd Ben Walton
2012-03-27 3:29 ` Jeff King
2012-03-27 3:34 ` Jeff King
2012-03-27 5:01 ` Jonathan Nieder
2012-03-27 5:12 ` Jeff King
2012-03-27 5:53 ` Jonathan Nieder
2012-03-27 6:23 ` Johannes Sixt
2012-03-28 2:46 ` Ben Walton
2012-03-28 4:22 ` Jeff King
2012-03-28 23:26 ` [PATCH] Use SHELL_PATH from build system " Ben Walton
2012-03-29 4:02 ` Junio C Hamano
2012-03-29 6:09 ` Jonathan Nieder
[not found] ` <1333073831-sup-5734@pinkfloyd.chass.utoronto.ca>
2012-03-30 6:32 ` Jonathan Nieder
2012-03-29 23:00 ` Jonathan Nieder
2012-03-28 23:28 ` [PATCH] Use SHELL_PATH to fork commands " Ben Walton
2012-03-27 4:26 ` Jonathan Nieder
2012-03-27 4:49 ` Jonathan Nieder
2012-03-27 2:45 ` [PATCH 0/2] Make run-command.c honour SHELL_PATH Ben Walton
2012-03-26 18:17 ` Jonathan Nieder
2012-03-26 18:08 ` Jeff King
2012-03-26 17:58 ` Jeff King
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=1332678696-4001-1-git-send-email-bwalton@artsci.utoronto.ca \
--to=bwalton@artsci.utoronto.ca \
--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).