diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-17 15:58:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 15:58:15 -0800 |
| commit | 4fa088209c81845e73756a4173a8c954e25958d2 (patch) | |
| tree | 7590d45bb9b42df97f3bd2e8e833aa4561cf1028 /diff.c | |
| parent | fa232d457ebc1620ab31be504068c38403497179 (diff) | |
| parent | 6396258368b76d432090c81096755dc1fbc89551 (diff) | |
| download | git-4fa088209c81845e73756a4173a8c954e25958d2.tar.gz | |
Merge branch 'jk/run-command-use-shell'
* jk/run-command-use-shell:
t4030, t4031: work around bogus MSYS bash path conversion
diff: run external diff helper with shell
textconv: use shell to run helper
editor: use run_command's shell feature
run-command: optimize out useless shell calls
run-command: convert simple callsites to use_shell
t0021: use $SHELL_PATH for the filter script
run-command: add "use shell" option
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2294,7 +2294,7 @@ static void run_external_diff(const char *pgm, } *arg = NULL; fflush(NULL); - retval = run_command_v_opt(spawn_arg, 0); + retval = run_command_v_opt(spawn_arg, RUN_USING_SHELL); remove_tempfile(); if (retval) { fprintf(stderr, "external diff died, stopping at %s.\n", name); @@ -3818,6 +3818,7 @@ static char *run_textconv(const char *pgm, struct diff_filespec *spec, *arg = NULL; memset(&child, 0, sizeof(child)); + child.use_shell = 1; child.argv = argv; child.out = -1; if (start_command(&child) != 0 || |