diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-19 18:47:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-19 18:47:51 -0700 |
| commit | 592689c46187165d80ab35c9090404b7ee248dbb (patch) | |
| tree | 8a5a72b6a7a90f278ab2885849d9bb97fdaf13ca /merge-index.c | |
| parent | Merge branch 'lt/objlist' into next (diff) | |
| parent | Restore SIGCHLD to SIG_DFL where we care about waitpid(). (diff) | |
| download | tgif-592689c46187165d80ab35c9090404b7ee248dbb.tar.xz | |
Merge branch 'jc/waitpid' into next
* jc/waitpid:
Restore SIGCHLD to SIG_DFL where we care about waitpid().
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>*)"); |