summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-20 13:11:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-20 13:11:48 -0700
commitec0465ade87996214959a393239eec520daf92ea (patch)
tree714fd5f0ab87cba55d894a2031220ff7f5cf1aff /builtin
parentMerge branch 'rs/daemon-hostname-in-strbuf' (diff)
parentt5528: do not fail with FreeBSD shell (diff)
downloadtgif-ec0465ade87996214959a393239eec520daf92ea.tar.xz
Merge branch 'km/bsd-shells'
Portability fixes and workarounds for shell scripts have been added to help BSD-derived systems. * km/bsd-shells: t5528: do not fail with FreeBSD shell help.c: use SHELL_PATH instead of hard-coded "/bin/sh" git-compat-util.h: move SHELL_PATH default into header git-instaweb: use @SHELL_PATH@ instead of /bin/sh git-instaweb: allow running in a working tree subdirectory
Diffstat (limited to 'builtin')
-rw-r--r--builtin/help.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/help.c b/builtin/help.c
index 6133fe496b..2ae8a1e985 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -171,7 +171,7 @@ static void exec_man_cmd(const char *cmd, const char *page)
{
struct strbuf shell_cmd = STRBUF_INIT;
strbuf_addf(&shell_cmd, "%s %s", cmd, page);
- execl("/bin/sh", "sh", "-c", shell_cmd.buf, (char *)NULL);
+ execl(SHELL_PATH, SHELL_PATH, "-c", shell_cmd.buf, (char *)NULL);
warning(_("failed to exec '%s': %s"), cmd, strerror(errno));
}