X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/31665579c2779669c0cc56b8eb63f162b7e165df..eac1b675414722ae90df75abc727b2795bc096f0:/ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index 25da00a..98738db 100644
--- 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)
@@ -63,7 +74,7 @@ static int print_branch(struct refinfo *ref)
 	html("</td><td>");
 
 	if (ref->object->type == OBJ_COMMIT) {
-		cgit_commit_link(info->subject, NULL, NULL, name, NULL);
+		cgit_commit_link(info->subject, NULL, NULL, name, NULL, 0);
 		html("</td><td>");
 		html_txt(info->author);
 		html("</td><td colspan='2'>");
@@ -145,6 +156,12 @@ static int print_tag(struct refinfo *ref)
 			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;
@@ -170,6 +187,8 @@ void cgit_print_branches(int maxcount)
 	list.refs = NULL;
 	list.alloc = list.count = 0;
 	for_each_branch_ref(cgit_refs_cb, &list);
+	if (ctx.repo->enable_remote_branches)
+		for_each_remote_ref(cgit_refs_cb, &list);
 
 	if (maxcount == 0 || maxcount > list.count)
 		maxcount = list.count;