Merge branch 'stable'

[ps-cgit] / ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index 0805fc8e00522373e8527580eb9e12cec5d4cc4d..d3b4f6e478aab81b9f59dbac3536ce1b7eb6344e 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -46,8 +46,19 @@ static int cmp_tag_age(const void *a, const void *b)
 {
        struct refinfo *r1 = *(struct refinfo **)a;
        struct refinfo *r2 = *(struct refinfo **)b;
+       int r1date, r2date;
 
-       return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date);
+       if (r1->object->type != OBJ_COMMIT)
+               r1date = r1->tag->tagger_date;
+       else
+               r1date = r1->commit->committer_date;
+
+       if (r2->object->type != OBJ_COMMIT)
+               r2date = r2->tag->tagger_date;
+       else
+               r2date = r2->commit->committer_date;
+
+       return cmp_age(r1date, r2date);
 }
 
 static int print_branch(struct refinfo *ref)
@@ -58,7 +69,8 @@ static int print_branch(struct refinfo *ref)
        if (!info)
                return 1;
        html("<tr><td>");
-       cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL);
+       cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL,
+                     ctx.qry.showmsg);
        html("</td><td>");
 
        if (ref->object->type == OBJ_COMMIT) {
@@ -138,12 +150,18 @@ static int print_tag(struct refinfo *ref)
                if (!header)
                        print_tag_header();
                html("<tr><td>");
-               html_txt(name);
+               cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
                html("</td><td>");
-               if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
+               if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT))
                        print_tag_downloads(ctx.repo, name);
                else
                        cgit_object_link(ref->object);
+               html("</td><td>");
+               if (ref->object->type == OBJ_COMMIT)
+                       html(ref->commit->author);
+               html("</td><td colspan='2'>");
+               if (ref->object->type == OBJ_COMMIT)
+                       cgit_print_age(ref->commit->commit->date, -1, NULL);
                html("</td></tr>\n");
        }
        return 0;