From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Mar 2015 20:11:48 +0000 (-0700)
Subject: Merge branch 'km/bsd-shells'
X-Git-Tag: v2.4.0-rc0~35
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ec0465ade87996214959a393239eec520daf92ea

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
---

ec0465ade87996214959a393239eec520daf92ea
diff --cc git-compat-util.h
index a3095be962,f55234dd27..fbfd10dadc
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -872,8 -872,8 +872,12 @@@ struct tm *git_gmtime_r(const time_t *
  #define gmtime_r git_gmtime_r
  #endif
  
 +#if !defined(USE_PARENS_AROUND_GETTEXT_N) && defined(__GNUC__)
 +#define USE_PARENS_AROUND_GETTEXT_N 1
 +#endif
 +
+ #ifndef SHELL_PATH
+ # define SHELL_PATH "/bin/sh"
+ #endif
+ 
  #endif