about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLukas Fleischer <cgit@cryptocrack.de>2013-08-22 14:48:47 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2013-08-22 14:55:11 +0200
commit735c7f0734aa0df49a7a899979f1eeef8dede863 (patch)
tree00594a309acb170f815e08bdbf5966bc9f9fa805
parentui-patch: Rename variables (diff)
downloadcgit-pink-735c7f0734aa0df49a7a899979f1eeef8dede863.tar.gz
cgit-pink-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.c1
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,
 	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);