X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=merge-index.c;h=0498a6f45e53947e356c6a390869d3f8194f05b7;hb=51d1e83f91a16363930023a5c39f79f270c04653;hp=024196e7ac53cb9ad09b38ea646bad81aff33306;hpb=90768daaa006516c7ae69ed89d7c2e67243dfac1;p=git.git

diff --git a/merge-index.c b/merge-index.c
index 024196e7a..0498a6f45 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -1,5 +1,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <signal.h>
 
 #include "cache.h"
 
@@ -99,6 +100,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>*)");