diff --git a/merge-index.c b/merge-index.c
index 6df43944b08fc7789eec2314353bd1f892afbf0b..fa719cb0b1bd227423587c9e41eed77c755465a4 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
#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;
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;
arguments[5] = "";
arguments[6] = "";
arguments[7] = "";
+ arguments[8] = NULL;
found = 0;
do {
static char hexbuf[4][60];