From: cgit at cryptocrack.de (Lukas Fleischer)
Subject: [PATCH] ui-patch.c: Fix formatting for merge commits
Date: Thu, 22 Aug 2013 14:48:47 +0200 [thread overview]
Message-ID: <1377175727-12644-1-git-send-email-cgit@cryptocrack.de> (raw)
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 at cryptocrack.de>
---
ui-patch.c | 1 +
1 file changed, 1 insertion(+)
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);
--
1.8.4.rc3.500.gc3113b0
next reply other threads:[~2013-08-22 12:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-22 12:48 cgit [this message]
2013-08-22 12:54 ` Jason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377175727-12644-1-git-send-email-cgit@cryptocrack.de \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).