Fixed GPF in fast-import caused by unterminated linked list.

[thirdparty/git.git] / merge-index.c

diff --git a/merge-index.c b/merge-index.c
index 190e12fb7ceeb012a063f8c97b574e9650d95cc1..646d090c58e774bdf0f412da39f4b67fd7a696c6 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
@@ -1,16 +1,18 @@
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <signal.h>
 
 #include "cache.h"
 
-static const char *pgm = NULL;
+static const char *pgm;
 static const char *arguments[8];
 static int one_shot, quiet;
 static int err;
 
 static void run_program(void)
 {
-       int pid = fork(), status;
+       pid_t pid = fork();
+       int status;
 
        if (pid < 0)
                die("unable to fork");