Browse Source

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>
maint
Junio C Hamano 18 years ago
parent
commit
843d49a479
  1. 3
      merge-index.c

3
merge-index.c

@ -2,7 +2,7 @@ @@ -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) @@ -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];

Loading…
Cancel
Save