From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Thu, 27 Jul 2006 17:13:24 +0000 (+0200)
Subject: merge-recur: Fix compiler warning with -pedantic
X-Git-Tag: v1.4.3-rc1~174^2~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b3f5daabc9fcfffc632a6a963cf5466745b7dbd;p=git.git

merge-recur: Fix compiler warning with -pedantic

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index 79c022e09..1a21ff302 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -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);