[PATCH 2/2] Use max_parents to support newer git upstream code

Dan McGee dpmcgee at gmail.com
Thu Jun 2 21:01:13 CEST 2011


This is necessary after commit ad5aeeded upstream.

Signed-off-by: Dan McGee <dpmcgee at gmail.com>
---
 ui-stats.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ui-stats.c b/ui-stats.c
index 59f4c1e..51dd6a2 100644
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -239,7 +239,7 @@ struct string_list collect_stats(struct cgit_context *ctx,
 	init_revisions(&rev, NULL);
 	rev.abbrev = DEFAULT_ABBREV;
 	rev.commit_format = CMIT_FMT_DEFAULT;
-	rev.no_merges = 1;
+	rev.max_parents = 1;
 	rev.verbose_header = 1;
 	rev.show_root_diff = 0;
 	setup_revisions(argc, argv, &rev, NULL);
-- 
1.7.5.2





More information about the CGit mailing list