Merge branch 'jc/waitpid'

* jc/waitpid:
  Restore SIGCHLD to SIG_DFL where we care about waitpid().
This commit is contained in:
Junio C Hamano 2006-06-22 02:19:08 -07:00
commit b879de1812
3 changed files with 15 additions and 0 deletions

View file

@ -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';

View file

@ -673,6 +673,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];

View file

@ -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>*)");