From 735c7f0734aa0df49a7a899979f1eeef8dede863 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <cgit@cryptocrack.de>
Date: Thu, 22 Aug 2013 14:48:47 +0200
Subject: ui-patch.c: Fix formatting for merge commits

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@cryptocrack.de>
---
 ui-patch.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui-patch.c')

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);
-- 
cgit 1.4.1-3-g733a5