summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-20 01:47:51 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-20 01:47:51 (GMT)
commit592689c46187165d80ab35c9090404b7ee248dbb (patch)
tree8a5a72b6a7a90f278ab2885849d9bb97fdaf13ca
parentb19beecd9456a2e6282634e5df751206b972604a (diff)
parentf0b7367cb124a628b80697f5ed095c5859022e21 (diff)
downloadgit-592689c46187165d80ab35c9090404b7ee248dbb.zip
git-592689c46187165d80ab35c9090404b7ee248dbb.tar.gz
git-592689c46187165d80ab35c9090404b7ee248dbb.tar.bz2
Merge branch 'jc/waitpid' into next
* jc/waitpid: Restore SIGCHLD to SIG_DFL where we care about waitpid().
-rw-r--r--connect.c5
-rw-r--r--daemon.c5
-rw-r--r--merge-index.c5
3 files changed, 15 insertions, 0 deletions
diff --git a/connect.c b/connect.c
index 52d709e..db7342e 100644
--- a/connect.c
+++ b/connect.c
@@ -581,6 +581,11 @@ int git_connect(int fd[2], char *url, const char *prog)
enum protocol protocol = PROTO_LOCAL;
int free_path = 0;
+ /* Without this we cannot rely on waitpid() to tell
+ * what happened to our children.
+ */
+ signal(SIGCHLD, SIG_DFL);
+
host = strstr(url, "://");
if(host) {
*host = '\0';
diff --git a/daemon.c b/daemon.c
index 2f03f99..1067004 100644
--- a/daemon.c
+++ b/daemon.c
@@ -671,6 +671,11 @@ int main(int argc, char **argv)
int inetd_mode = 0;
int i;
+ /* Without this we cannot rely on waitpid() to tell
+ * what happened to our children.
+ */
+ signal(SIGCHLD, SIG_DFL);
+
for (i = 1; i < argc; i++) {
char *arg = argv[i];
diff --git a/merge-index.c b/merge-index.c
index 024196e..190e12f 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>*)");