Update git to v1.7.5.4

[ps-cgit] / ui-stats.c

diff --git a/ui-stats.c b/ui-stats.c
index 36e17d92da8d5791dd042ebbaceeeec1713fcd03..51dd6a2e0d115039a93b57c7e997fcd2c3bac3dd 100644 (file)
--- 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);
@@ -407,7 +407,7 @@ void cgit_show_stats(struct cgit_context *ctx)
        html_intoption(50, "50", top);
        html_intoption(100, "100", top);
        html_intoption(-1, "all", top);
-       html("</select></td><tr>");
+       html("</select></td></tr>");
        html("<tr><td/><td class='ctrl'>");
        html("<noscript><input type='submit' value='Reload'/></noscript>");
        html("</td></tr></table>");