aboutsummaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
Diffstat (limited to 'merge-index.c')
-rw-r--r--merge-index.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/merge-index.c b/merge-index.c
index 0498a6f45..646d090c5 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -4,14 +4,15 @@
#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");