X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=merge-index.c;h=646d090c58e774bdf0f412da39f4b67fd7a696c6;hb=96779be48a8e5d3a50a07e0fcab942e7066235a9;hp=0498a6f45e53947e356c6a390869d3f8194f05b7;hpb=75dedd5a21246be03ae443e9fc6a9f75c6d2995b;p=git.git

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