diff options
author | Lukas Fleischer | 2013-08-22 14:48:47 +0200 |
---|---|---|
committer | Jason A. Donenfeld | 2013-08-22 14:55:11 +0200 |
commit | 735c7f0734aa0df49a7a899979f1eeef8dede863 (patch) | |
tree | 00594a309acb170f815e08bdbf5966bc9f9fa805 | |
parent | ui-patch: Rename variables (diff) | |
download | cgit-735c7f0734aa0df49a7a899979f1eeef8dede863.tar.gz cgit-735c7f0734aa0df49a7a899979f1eeef8dede863.zip |
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>
-rw-r--r-- | ui-patch.c | 1 |
1 files changed, 1 insertions, 0 deletions
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, | |||
72 | rev.verbose_header = 1; | 72 | rev.verbose_header = 1; |
73 | rev.diff = 1; | 73 | rev.diff = 1; |
74 | rev.show_root_diff = 1; | 74 | rev.show_root_diff = 1; |
75 | rev.max_parents = 1; | ||
75 | rev.diffopt.output_format |= DIFF_FORMAT_PATCH; | 76 | rev.diffopt.output_format |= DIFF_FORMAT_PATCH; |
76 | setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev, | 77 | setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev, |
77 | NULL); | 78 | NULL); |