Merge branch 'stable'

[cgit.git] / ui-tag.c

diff --git a/ui-tag.c b/ui-tag.c
index 6d761f30722b444e7f3eb11ad9d2bcf0f97ccd1c..c2d72aff613d6536cce975984ce55f718060d4ca 100644 (file)
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -7,7 +7,8 @@
  */
 
 #include "cgit.h"
-
+#include "html.h"
+#include "ui-shared.h"
 
 static void print_tag_content(char *buf)
 {
@@ -36,7 +37,10 @@ void cgit_print_tag(char *revname)
        struct tag *tag;
        struct taginfo *info;
 
-       if (get_sha1(revname, sha1)) {
+       if (!revname)
+               revname = ctx.qry.head;
+
+       if (get_sha1(fmt("refs/tags/%s", revname), sha1)) {
                cgit_print_error(fmt("Bad tag reference: %s", revname));
                return;
        }
@@ -52,16 +56,21 @@ void cgit_print_tag(char *revname)
                        return;
                }
                html("<table class='commit-info'>\n");
-               htmlf("<tr><td>Tag name</td><td>%s (%s)</td></tr>\n",
-                     revname, sha1_to_hex(sha1));
+               htmlf("<tr><td>Tag name</td><td>");
+               html_txt(revname);
+               htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1));
                if (info->tagger_date > 0) {
                        html("<tr><td>Tag date</td><td>");
-                       cgit_print_date(info->tagger_date, FMT_LONGDATE);
+                       cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time);
                        html("</td></tr>\n");
                }
                if (info->tagger) {
                        html("<tr><td>Tagged by</td><td>");
                        html_txt(info->tagger);
+                       if (info->tagger_email && !ctx.cfg.noplainemail) {
+                               html(" ");
+                               html_txt(info->tagger_email);
+                       }
                        html("</td></tr>\n");
                }
                html("<tr><td>Tagged object</td><td>");
@@ -69,6 +78,15 @@ void cgit_print_tag(char *revname)
                html("</td></tr>\n");
                html("</table>\n");
                print_tag_content(info->msg);
-       }
+       } else {
+               html("<table class='commit-info'>\n");
+               htmlf("<tr><td>Tag name</td><td>");
+               html_txt(revname);
+               html("</td></tr>\n");
+               html("<tr><td>Tagged object</td><td>");
+               cgit_object_link(obj);
+               html("</td></tr>\n");
+               html("</table>\n");
+        }
        return;
 }