提交 843d49a4 编写于 作者: J Junio C Hamano

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: NJunio C Hamano <junkio@cox.net>
上级 5d865017
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "run-command.h" #include "run-command.h"
static const char *pgm; static const char *pgm;
static const char *arguments[8]; static const char *arguments[9];
static int one_shot, quiet; static int one_shot, quiet;
static int err; 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[5] = "";
arguments[6] = ""; arguments[6] = "";
arguments[7] = ""; arguments[7] = "";
arguments[8] = NULL;
found = 0; found = 0;
do { do {
static char hexbuf[4][60]; static char hexbuf[4][60];
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册