diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-19 18:25:21 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-19 18:44:58 -0700 |
commit | f0b7367cb124a628b80697f5ed095c5859022e21 (patch) | |
tree | 5a7d667c5985adb52169ec8de065bbf39a3641b8 /merge-index.c | |
parent | d281786fcd6d0df47dd46e415f1a804b2e81ed9b (diff) | |
download | git-f0b7367cb124a628b80697f5ed095c5859022e21.tar.gz |
Restore SIGCHLD to SIG_DFL where we care about waitpid().
It was reported that under one implementation of socks client
"git clone" fails with "error: waitpid failed (No child processes)",
because "git" is spawned after setting SIGCHLD to SIG_IGN.
Arguably it may be a broken setting, but we should protect
ourselves so that we can get reliable results from waitpid() for
the children we care about.
This patch resets SIGCHLD to SIG_DFL in three places:
- connect.c::git_connect() - initiators of git native
protocol transfer are covered with this.
- daemon.c::main() - obviously.
- merge-index.c::main() - obviously.
There are other programs that do fork() but do not waitpid():
http-push, imap-send. upload-pack does not either, but in the
case of that program, each of the forked halves runs exec()
another program, so this change would not have much effect
there.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-index.c')
-rw-r--r-- | merge-index.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/merge-index.c b/merge-index.c index 024196e7ac..190e12fb7c 100644 --- a/merge-index.c +++ b/merge-index.c @@ -99,6 +99,11 @@ int main(int argc, char **argv) { int i, force_file = 0; + /* Without this we cannot rely on waitpid() to tell + * what happened to our children. + */ + signal(SIGCHLD, SIG_DFL); + if (argc < 3) usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)"); |