cache.c: fix header order

[cgit.git] / ui-tag.c

diff --git a/ui-tag.c b/ui-tag.c
index 39e4cb82c5f66c6524962fe4be794cd5bab71782..c1d173836357a017538db1dd7028b265acc04895 100644 (file)
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -1,12 +1,13 @@
 /* ui-tag.c: display a tag
  *
- * Copyright (C) 2007 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
+#include "ui-tag.h"
 #include "html.h"
 #include "ui-shared.h"
 
@@ -30,7 +31,7 @@ static void print_tag_content(char *buf)
        }
 }
 
-void print_download_links(char *revname)
+static void print_download_links(char *revname)
 {
        html("<tr><th>download</th><td class='sha1'>");
        cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
@@ -40,6 +41,7 @@ void print_download_links(char *revname)
 
 void cgit_print_tag(char *revname)
 {
+       struct strbuf fullref = STRBUF_INIT;
        unsigned char sha1[20];
        struct object *obj;
        struct tag *tag;
@@ -48,20 +50,21 @@ void cgit_print_tag(char *revname)
        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;
+       strbuf_addf(&fullref, "refs/tags/%s", revname);
+       if (get_sha1(fullref.buf, sha1)) {
+               cgit_print_error("Bad tag reference: %s", revname);
+               goto cleanup;
        }
        obj = parse_object(sha1);
        if (!obj) {
-               cgit_print_error(fmt("Bad object id: %s", sha1_to_hex(sha1)));
-               return;
+               cgit_print_error("Bad object id: %s", sha1_to_hex(sha1));
+               goto cleanup;
        }
        if (obj->type == OBJ_TAG) {
                tag = lookup_tag(sha1);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
-                       cgit_print_error(fmt("Bad tag object: %s", revname));
-                       return;
+                       cgit_print_error("Bad tag object: %s", revname);
+                       goto cleanup;
                }
                html("<table class='commit-info'>\n");
                htmlf("<tr><td>tag name</td><td>");
@@ -74,11 +77,13 @@ void cgit_print_tag(char *revname)
                }
                if (info->tagger) {
                        html("<tr><td>tagged by</td><td>");
+                       cgit_open_filter(ctx.repo->email_filter, info->tagger_email, "tag");
                        html_txt(info->tagger);
                        if (info->tagger_email && !ctx.cfg.noplainemail) {
                                html(" ");
                                html_txt(info->tagger_email);
                        }
+                       cgit_close_filter(ctx.repo->email_filter);
                        html("</td></tr>\n");
                }
                html("<tr><td>tagged object</td><td class='sha1'>");
@@ -99,6 +104,8 @@ void cgit_print_tag(char *revname)
                if (ctx.repo->snapshots)
                        print_download_links(revname);
                html("</table>\n");
-        }
-       return;
+       }
+
+cleanup:
+       strbuf_release(&fullref);
 }