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);
> 2020-12-02Publish "hot tips"June McEnroe 2020-11-26Publish "Inability"June McEnroe 2020-11-26Render content into atom feedJune McEnroe 2020-11-26Update plan with different things I won't doJune McEnroe 2020-11-19Add "Come On Petunia"June McEnroe 2020-11-13Add x4 to LESSJune McEnroe 2020-11-04Remove modified sensitivity settingsJune McEnroe 2020-10-29Remove editJune McEnroe 2020-10-27Switch gr alias back to git rebaseJune McEnroe 2020-10-27Allow cd host: to cd to same path over sshJune McEnroe 2020-10-27Use SendEnv for cd host:pathJune McEnroe 2020-10-27Allow cd host:path over sshJune McEnroe 2020-10-07Use mandoc -T utf8 for text.June McEnroe 2020-09-20Add The Awakened KingdomJune McEnroe 2020-09-12Move /opt/local back, cheat port select to use system manJune McEnroe 2020-09-12Move /opt/local behind /usr againJune McEnroe 2020-09-12Enable toc in cgit renderings of man pagesJune McEnroe 2020-09-11Install mandoc on macOSJune McEnroe 2020-09-11Rewrite install script yet againJune McEnroe 2020-09-11Remove NetBSD from install scriptJune McEnroe 2020-09-11Use MacPorts rather than pkgsrcJune McEnroe 2020-09-11Add debian VM name to sshJune McEnroe 2020-09-11Add influencer tweetJune McEnroe 2020-09-10Add The Kingdom of GodsJune McEnroe 2020-09-07Add SunglassesJune McEnroe 2020-09-06Add Between the BreathsJune McEnroe 2020-09-04Open /dev/tty in nudgeJune McEnroe 2020-09-04Add nudgeJune McEnroe 2020-09-03Build fbclock with -lzJune McEnroe 2020-08-29Add tweets from retweetsJune McEnroe