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>
Lukas Fleischer cgit@cryptocrack.de
Thu, 22 Aug 2013 14:48:47 +0200
1 files changed,
1 insertions(+),
0 deletions(-)
jump to
M
ui-patch.c
→
ui-patch.c
@@ -72,6 +72,7 @@ rev.abbrev = DEFAULT_ABBREV;
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);