| -rw-r--r-- | cgit.h | 1 | ||||
| -rw-r--r-- | shared.c | 3 | ||||
| -rw-r--r-- | ui-summary.c | 31 |
3 files changed, 3 insertions, 32 deletions
@@ -144,7 +144,6 @@ extern int cgit_cache_static_ttl; extern int cgit_cache_max_create_time; extern int cgit_summary_log; extern int cgit_summary_tags; -extern int cgit_summary_branches; extern int cgit_max_msg_len; extern int cgit_max_repodesc_len; @@ -39,7 +39,6 @@ int cgit_cache_static_ttl = -1; int cgit_cache_max_create_time = 5; int cgit_summary_log = 0; int cgit_summary_tags = 0; -int cgit_summary_branches = 0; int cgit_renamelimit = -1; int cgit_max_msg_len = 60; @@ -183,8 +182,6 @@ void cgit_global_config_cb(const char *name, const char *value) cgit_max_commit_count = atoi(value); else if (!strcmp(name, "summary-log")) cgit_summary_log = atoi(value); - else if (!strcmp(name, "summary-branches")) - cgit_summary_branches = atoi(value); else if (!strcmp(name, "summary-tags")) cgit_summary_tags = atoi(value); else if (!strcmp(name, "agefile")) diff --git a/ui-summary.c b/ui-summary.c index df79d01..05170cc 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -24,22 +24,6 @@ static int cmp_age(int age1, int age2) return -1; } -static int cmp_ref_name(const void *a, const void *b) -{ - struct refinfo *r1 = *(struct refinfo **)a; - struct refinfo *r2 = *(struct refinfo **)b; - - return strcmp(r1->refname, r2->refname); -} - -static int cmp_branch_age(const void *a, const void *b) -{ - struct refinfo *r1 = *(struct refinfo **)a; - struct refinfo *r2 = *(struct refinfo **)b; - - return cmp_age(r1->commit->committer_date, r2->commit->committer_date); -} - static int cmp_tag_age(const void *a, const void *b) { struct refinfo *r1 = *(struct refinfo **)a; @@ -166,7 +150,7 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, return 0; } -static void cgit_print_branches(int maxcount) +static void cgit_print_branches() { struct reflist list; int i; @@ -179,16 +163,7 @@ static void cgit_print_branches(int maxcount) list.refs = NULL; list.alloc = list.count = 0; for_each_branch_ref(cgit_refs_cb, &list); - - if (maxcount == 0 || maxcount > list.count) - maxcount = list.count; - - if (maxcount < list.count) { - qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); - qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); - } - - for(i=0; i<maxcount; i++) + for(i=0; i<list.count; i++) cgit_print_branch(list.refs[i]); } @@ -238,7 +213,7 @@ void cgit_print_summary() html("<table class='list nowrap'>"); if (cgit_summary_log > 0) html("<tr class='nohover'><td colspan='4'> </td></tr>"); - cgit_print_branches(cgit_summary_branches); + cgit_print_branches(); html("<tr class='nohover'><td colspan='4'> </td></tr>"); cgit_print_tags(cgit_summary_tags); html("</table>"); |