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>

diff --git a/ui-patch.c b/ui-patch.c
index 1dbb39d47ed5631b77c129928487265ee20563f7..4d35167565daa1259704c8d7ce06c3245a311b52 100644 (file)
--- 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.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);
        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
        setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
                        NULL);