undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recur: Fix compiler warning with -pedantic

Browse Source 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin 2006-07-27 19:13:24 +02:00 committed by Junio C Hamano
parent 5d3afe05d9
commit 7b3f5daabc
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
merge-recursive.c
View File

@ -642,7 +642,7 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
char src2[PATH_MAX];
const char *argv[] = {
"merge", "-L", NULL, "-L", NULL, "-L", NULL,
src1, orig, src2,
NULL, NULL, NULL,
NULL
};
char *la, *lb, *lo;
@ -654,6 +654,9 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
argv[2] = la = strdup(mkpath("%s/%s", branch1Name, a->path));
argv[6] = lb = strdup(mkpath("%s/%s", branch2Name, b->path));
argv[4] = lo = strdup(mkpath("orig/%s", o->path));
argv[7] = src1;
argv[8] = orig;
argv[9] = src2,
code = run_command_v(10, argv);