X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-index.c;h=fa719cb0b1bd227423587c9e41eed77c755465a4;hb=785586142a5ed083b97b7be472c08982ae88fd8f;hp=6df43944b08fc7789eec2314353bd1f892afbf0b;hpb=b49809c9615e7d2b854ce88b3dd0cd7790588fe5;p=git.git

diff --git a/merge-index.c b/merge-index.c
index 6df43944b..fa719cb0b 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -2,7 +2,7 @@
 #include "run-command.h"
 
 static const char *pgm;
-static const char *arguments[8];
+static const char *arguments[9];
 static int one_shot, quiet;
 static int err;
 
@@ -25,7 +25,7 @@ static void run_program(void)
 static int merge_entry(int pos, const char *path)
 {
 	int found;
-	
+
 	if (pos >= active_nr)
 		die("git-merge-index: %s not in the cache", path);
 	arguments[0] = pgm;
@@ -36,6 +36,7 @@ static int merge_entry(int pos, const char *path)
 	arguments[5] = "";
 	arguments[6] = "";
 	arguments[7] = "";
+	arguments[8] = NULL;
 	found = 0;
 	do {
 		static char hexbuf[4][60];