From mboxrd@z Thu Jan  1 00:00:00 1970
From: cgit at cryptocrack.de (Lukas Fleischer)
Date: Thu, 22 Aug 2013 14:48:47 +0200
Subject: [PATCH] ui-patch.c: Fix formatting for merge commits
Message-ID: <1377175727-12644-1-git-send-email-cgit@cryptocrack.de>

Add max_parents = 1 to the revision walk in order to make sure we do not
include the footer signature twice for merge commits.

Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
 ui-patch.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui-patch.c b/ui-patch.c
index 1dbb39d..4d35167 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -72,6 +72,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
 	rev.verbose_header = 1;
 	rev.diff = 1;
 	rev.show_root_diff = 1;
+	rev.max_parents = 1;
 	rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 	setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
 			NULL);
-- 
1.8.4.rc3.500.gc3113b0