Skip to content

Commit

Permalink
Fix merge-index
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Mar 19, 2007
1 parent 5d86501 commit 843d49a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion merge-index.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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];
Expand Down

0 comments on commit 843d49a

Please sign in to comment.