-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | cgitrc | 5 | ||||
-rw-r--r-- | shared.c | 3 | ||||
-rw-r--r-- | ui-summary.c | 8 |
4 files changed, 16 insertions, 1 deletions
@@ -129,2 +129,3 @@ extern int cgit_cache_static_ttl; | |||
129 | extern int cgit_cache_max_create_time; | 129 | extern int cgit_cache_max_create_time; |
130 | extern int cgit_summary_log; | ||
130 | 131 | ||
@@ -22,2 +22,7 @@ | |||
22 | 22 | ||
23 | ## Enable/disable display of HEAD shortlog in summary view. Set it to maximum | ||
24 | ## number of commits that should be displayed | ||
25 | #summary-log=0 | ||
26 | |||
27 | |||
23 | ## Specify a root for virtual urls. This makes cgit generate urls like | 28 | ## Specify a root for virtual urls. This makes cgit generate urls like |
@@ -36,2 +36,3 @@ int cgit_cache_static_ttl = -1; | |||
36 | int cgit_cache_max_create_time = 5; | 36 | int cgit_cache_max_create_time = 5; |
37 | int cgit_summary_log = 0; | ||
37 | 38 | ||
@@ -166,2 +167,4 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
166 | cgit_max_commit_count = atoi(value); | 167 | cgit_max_commit_count = atoi(value); |
168 | else if (!strcmp(name, "summary-log")) | ||
169 | cgit_summary_log = atoi(value); | ||
167 | else if (!strcmp(name, "agefile")) | 170 | else if (!strcmp(name, "agefile")) |
diff --git a/ui-summary.c b/ui-summary.c index 15e8aec..4bda4c2 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -21,2 +21,5 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | |||
21 | commit = lookup_commit(sha1); | 21 | commit = lookup_commit(sha1); |
22 | // object is not really parsed at this point, because of some fallout | ||
23 | // from previous calls to git functions in cgit_print_log() | ||
24 | commit->object.parsed = 0; | ||
22 | if (commit && !parse_commit(commit)){ | 25 | if (commit && !parse_commit(commit)){ |
@@ -205,4 +208,7 @@ void cgit_print_summary() | |||
205 | html("</div>"); | 208 | html("</div>"); |
206 | 209 | if (cgit_summary_log > 0) | |
210 | cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0); | ||
207 | html("<table class='list nowrap'>"); | 211 | html("<table class='list nowrap'>"); |
212 | if (cgit_summary_log > 0) | ||
213 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); | ||
208 | cgit_print_branches(); | 214 | cgit_print_branches(); |