aboutsummaryrefslogtreecommitdiffstats
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-29 13:18:50 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-29 13:18:50 -0800
commit6e1c9bb0e0098b921c30d7f4700e14f1ed71a273 (patch)
treeff442ddb6b1cb95cc95fb20d09f8b8f0302d3ced /git.c
parentGit 1.7.9 (diff)
parentdashed externals: kill children on exit (diff)
downloadgit-6e1c9bb0e0098b921c30d7f4700e14f1ed71a273.tar.gz
git-6e1c9bb0e0098b921c30d7f4700e14f1ed71a273.zip
Merge branch 'cb/maint-kill-subprocess-upon-signal'
* cb/maint-kill-subprocess-upon-signal: dashed externals: kill children on exit run-command: optionally kill children on exit
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/git.c b/git.c
index fb9029cbf1..3805616630 100644
--- a/git.c
+++ b/git.c
@@ -495,7 +495,7 @@ static void execv_dashed_external(const char **argv)
* if we fail because the command is not found, it is
* OK to return. Otherwise, we just pass along the status code.
*/
- status = run_command_v_opt(argv, RUN_SILENT_EXEC_FAILURE);
+ status = run_command_v_opt(argv, RUN_SILENT_EXEC_FAILURE | RUN_CLEAN_ON_EXIT);
if (status >= 0 || errno != ENOENT)
exit(status);