summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle J. McKay <mackyle@gmail.com>2015-03-07 21:07:59 -0800
committerJunio C Hamano <gitster@pobox.com>2015-03-10 15:11:24 -0700
commit1b56cdf901f6e6a73d0edadf56afb1c878c7622a (patch)
tree14488a9878fcab13c3f779f2ea02fa206e94f9da
parentff7a9dc2c503360190650d604dbdbc293d99b765 (diff)
downloadgit-1b56cdf901f6e6a73d0edadf56afb1c878c7622a.tar.gz
git-compat-util.h: move SHELL_PATH default into header
If SHELL_PATH is not defined we use "/bin/sh". However, run-command.c is not the only file that needs to use the default value so move it into a common header. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--git-compat-util.h4
-rw-r--r--run-command.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 8b72e2a8dd..f55234dd27 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -872,4 +872,8 @@ struct tm *git_gmtime_r(const time_t *, struct tm *);
#define gmtime_r git_gmtime_r
#endif
+#ifndef SHELL_PATH
+# define SHELL_PATH "/bin/sh"
+#endif
+
#endif
diff --git a/run-command.c b/run-command.c
index 0b432cc971..3afb124c79 100644
--- a/run-command.c
+++ b/run-command.c
@@ -4,10 +4,6 @@
#include "sigchain.h"
#include "argv-array.h"
-#ifndef SHELL_PATH
-# define SHELL_PATH "/bin/sh"
-#endif
-
void child_process_init(struct child_process *child)
{
memset(child, 0, sizeof(*child));