Andrew's git / gitweb.git / diff
?
Merge branch 'km/bsd-shells'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2015 20:11:48 +0000 (13:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2015 20:11:48 +0000 (13:11 -0700)
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

1  2 
builtin/help.c patch | diff1 | diff2 | blob | history
git-compat-util.h patch | diff1 | diff2 | blob | history
diff --cc builtin/help.c
Simple merge
diff --cc git-compat-util.h
index a3095be962c04d5b55c54ec39c6c3e6989372c36,f55234dd27f6720a36730dc1660a10108dee55d5..fbfd10dadc0352b5699eaab164959d68a52c9aa6
--- 1/git-compat-util.h
--- 2/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