kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 2007-03-19 02:48:37 -07:00
parent 5d86501742
commit 843d49a479
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
merge-index.c
View File

@ -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];