Fix merge-index
An earlier conversion to run_command() from execlp() forgot that run_command() takes an array that is terminated with NULL. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Mar 19, 2007 at 02:48 UTC
843d49a47906bfc7b89553da0c5e4f06ed4c348b
1 file changed
+2
-1
merge-index.c
+2
-1
@@ -2,7 +2,7 @@
2
#include "run-command.h"
3
4
static const char *pgm;
5
-static const char *arguments[8];
5
+static const char *arguments[9];
6
static int one_shot, quiet;
7
static int err;
8
@@ -36,6 +36,7 @@ static int merge_entry(int pos, const char *path)
36
arguments[5] = "";
37
arguments[6] = "";
38
arguments[7] = "";
39
+ arguments[8] = NULL;
40
found = 0;
41
do {
42
static char hexbuf[4][60];