{"thread":{"id":"5019","subject":"[PATCH 4/6] merge-recur: Fix compiler warning with -pedantic","startedAt":"2006-07-27T17:13:24Z","lastAt":"2006-07-27T17:13:24Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"24226","messageId":"Pine.LNX.4.63.0607271913140.29667@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"5019","inReplyTo":null,"subject":"[PATCH 4/6] merge-recur: Fix compiler warning with -pedantic","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-07-27T17:13:24Z","receivedAt":"2006-07-27T17:13:24Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n merge-recursive.c |    5 ++++-\n 1 files changed, 4 insertions(+), 1 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 9a86cdb..645ef8c 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -642,7 +642,7 @@ static struct merge_file_info merge_file\n \t\t\tchar src2[PATH_MAX];\n \t\t\tconst char *argv[] = {\n \t\t\t\t\"merge\", \"-L\", NULL, \"-L\", NULL, \"-L\", NULL,\n-\t\t\t\tsrc1, orig, src2,\n+\t\t\t\tNULL, NULL, NULL,\n \t\t\t\tNULL\n \t\t\t};\n \t\t\tchar *la, *lb, *lo;\n@@ -654,6 +654,9 @@ static struct merge_file_info merge_file\n \t\t\targv[2] = la = strdup(mkpath(\"%s/%s\", branch1Name, a->path));\n \t\t\targv[6] = lb = strdup(mkpath(\"%s/%s\", branch2Name, b->path));\n \t\t\targv[4] = lo = strdup(mkpath(\"orig/%s\", o->path));\n+\t\t\targv[7] = src1;\n+\t\t\targv[8] = orig;\n+\t\t\targv[9] = src2,\n \n \t\t\tcode = run_command_v(10, argv);\n \n-- \n1.4.2.rc2.g6a4e\n"}]}