* [PATCH] ui-patch.c: Fix formatting for merge commits
@ 2013-08-22 12:48 cgit
2013-08-22 12:54 ` Jason
0 siblings, 1 reply; 2+ messages in thread
From: cgit @ 2013-08-22 12:48 UTC (permalink / 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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] ui-patch.c: Fix formatting for merge commits
2013-08-22 12:48 [PATCH] ui-patch.c: Fix formatting for merge commits cgit
@ 2013-08-22 12:54 ` Jason
0 siblings, 0 replies; 2+ messages in thread
From: Jason @ 2013-08-22 12:54 UTC (permalink / raw)
On Thu, Aug 22, 2013 at 2:48 PM, Lukas Fleischer <cgit at cryptocrack.de> wrote:
> + rev.max_parents = 1;
Good catch. This is what builtin/log.c does in get_patch_ids as well.
Might be a good function to look at for comparison, in case you aren't
already doing that.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-22 12:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-22 12:48 [PATCH] ui-patch.c: Fix formatting for merge commits cgit
2013-08-22 12:54 ` Jason
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).