summaryrefslogtreecommitdiff
path: root/ui-stats.c
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-03-02 12:32:10 +0000
committerJason A. Donenfeld <Jason@zx2c4.com>2013-03-02 15:38:03 +0000
commitbfc14d067da0fdf65f306fcd9a65829d9694dbeb (patch)
tree71097af45a55844f67f4af411d461903f5d60519 /ui-stats.c
parentc0a92e82da3063efc230538ba109ff95aa59589a (diff)
downloadcgit-bfc14d067da0fdf65f306fcd9a65829d9694dbeb.tar
cgit-bfc14d067da0fdf65f306fcd9a65829d9694dbeb.tar.gz
cgit-bfc14d067da0fdf65f306fcd9a65829d9694dbeb.zip
Update git to v1.7.5.4
Some changes to diff options: - no_merges has become the more general max_parents - path restriction now uses struct pathspec Signed-off-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'ui-stats.c')
-rw-r--r--ui-stats.c2
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);