run-command: refactor getting the Unix shell path into its own function
This encapsulates the platform-specific logic better. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jul 13, 2024 at 21:08 UTC
0593c1ea30737cf2d61f7c191d3687b37badf3be
1 file changed
+10
-5
run-command.c
+10
-5
index d9f80fabe6..59e433bf91 100644
--- a/run-command.c
+++ b/run-command.c
@@ -274,17 +274,22 @@ int sane_execvp(const char *file, char * const argv[])
return -1;
}
+static const char *git_shell_path(void)
+{
+#ifndef GIT_WINDOWS_NATIVE
+ return SHELL_PATH;
+#else
+ return "sh";
+#endif
+}
+
static const char **prepare_shell_cmd(struct strvec *out, const char **argv)
{
if (!argv[0])
BUG("shell command is empty");
if (strcspn(argv[0], "|&;<>()$`\\\"' \t\n*?[#~=%") != strlen(argv[0])) {
-#ifndef GIT_WINDOWS_NATIVE
- strvec_push(out, SHELL_PATH);
-#else
- strvec_push(out, "sh");
-#endif
+ strvec_push(out, git_shell_path());
strvec_push(out, "-c");
/*