summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-19 09:48:37 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-19 09:48:37 (GMT)
commit843d49a47906bfc7b89553da0c5e4f06ed4c348b (patch)
tree2ee6d8fafb2468dcd65a8b57279c6c5ba9c9c9c4 /merge-index.c
parent5d86501742663978dfa4dd8accaee4bb93639fee (diff)
downloadgit-843d49a47906bfc7b89553da0c5e4f06ed4c348b.zip
git-843d49a47906bfc7b89553da0c5e4f06ed4c348b.tar.gz
git-843d49a47906bfc7b89553da0c5e4f06ed4c348b.tar.bz2
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>
Diffstat (limited to 'merge-index.c')
-rw-r--r--merge-index.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-index.c b/merge-index.c
index 6df4394..5599fd3 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;
@@ -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];