mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-26 10:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui-patch.c: Fix formatting for merge commits

Browse Source 
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>
This commit is contained in:
Lukas Fleischer 2013-08-22 14:48:47 +02:00 committed by Jason A. Donenfeld
parent 4e00d338b0
commit 735c7f0734
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui-patch.c
View File

@ -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);