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>
Esse commit está contido em:
pai
4e00d338b0
commit
735c7f0734
@ -72,6 +72,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
|
|||||||
rev.verbose_header = 1;
|
rev.verbose_header = 1;
|
||||||
rev.diff = 1;
|
rev.diff = 1;
|
||||||
rev.show_root_diff = 1;
|
rev.show_root_diff = 1;
|
||||||
|
rev.max_parents = 1;
|
||||||
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
|
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
|
||||||
setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
|
setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
|
||||||
NULL);
|
NULL);
|
||||||
|
Carregando…
Referência em uma nova issue
Block a user