summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-27 17:13:24 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-28 02:39:15 (GMT)
commit7b3f5daabc9fcfffc632a6a963cf5466745b7dbd (patch)
tree38e9c7918d0e034fc6e65f2c912e74ee610458b0 /merge-recursive.c
parent5d3afe05d9466a8472be315793dfc08594b1e9c4 (diff)
downloadgit-7b3f5daabc9fcfffc632a6a963cf5466745b7dbd.zip
git-7b3f5daabc9fcfffc632a6a963cf5466745b7dbd.tar.gz
git-7b3f5daabc9fcfffc632a6a963cf5466745b7dbd.tar.bz2
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>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 79c022e..1a21ff3 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);