summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-01-11 15:38:19 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-01-11 15:38:19 (UTC)
commit5176db2e2bd221c5448a512514f9165258503a8e (patch) (unidiff)
tree23b8214c40c1a9df158d0b3fb4b61429a3f0898b
parent1383fe3fa60b4c207d103a49943a59de71a36fe1 (diff)
parent720b6ece90900df9f836a45d8e7f1cd56f62400a (diff)
downloadcgit-5176db2e2bd221c5448a512514f9165258503a8e.zip
cgit-5176db2e2bd221c5448a512514f9165258503a8e.tar.gz
cgit-5176db2e2bd221c5448a512514f9165258503a8e.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-tag.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui-tag.c b/ui-tag.c
index 3aea87d..54b9f4c 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -32,48 +32,49 @@ static void print_tag_content(char *buf)
32 32
33void cgit_print_tag(char *revname) 33void cgit_print_tag(char *revname)
34{ 34{
35 unsigned char sha1[20]; 35 unsigned char sha1[20];
36 struct object *obj; 36 struct object *obj;
37 struct tag *tag; 37 struct tag *tag;
38 struct taginfo *info; 38 struct taginfo *info;
39 39
40 if (get_sha1(revname, sha1)) { 40 if (get_sha1(revname, sha1)) {
41 cgit_print_error(fmt("Bad tag reference: %s", revname)); 41 cgit_print_error(fmt("Bad tag reference: %s", revname));
42 return; 42 return;
43 } 43 }
44 obj = parse_object(sha1); 44 obj = parse_object(sha1);
45 if (!obj) { 45 if (!obj) {
46 cgit_print_error(fmt("Bad object id: %s", sha1_to_hex(sha1))); 46 cgit_print_error(fmt("Bad object id: %s", sha1_to_hex(sha1)));
47 return; 47 return;
48 } 48 }
49 if (obj->type == OBJ_TAG) { 49 if (obj->type == OBJ_TAG) {
50 tag = lookup_tag(sha1); 50 tag = lookup_tag(sha1);
51 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) { 51 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
52 cgit_print_error(fmt("Bad tag object: %s", revname)); 52 cgit_print_error(fmt("Bad tag object: %s", revname));
53 return; 53 return;
54 } 54 }
55 html("<table class='commit-info'>\n"); 55 html("<table class='commit-info'>\n");
56 htmlf("<tr><td>Tag name</td><td>%s (%s)</td></tr>\n", 56 htmlf("<tr><td>Tag name</td><td>");
57 revname, sha1_to_hex(sha1)); 57 html_txt(revname);
58 htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1));
58 if (info->tagger_date > 0) { 59 if (info->tagger_date > 0) {
59 html("<tr><td>Tag date</td><td>"); 60 html("<tr><td>Tag date</td><td>");
60 cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time); 61 cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time);
61 html("</td></tr>\n"); 62 html("</td></tr>\n");
62 } 63 }
63 if (info->tagger) { 64 if (info->tagger) {
64 html("<tr><td>Tagged by</td><td>"); 65 html("<tr><td>Tagged by</td><td>");
65 html_txt(info->tagger); 66 html_txt(info->tagger);
66 if (info->tagger_email) { 67 if (info->tagger_email) {
67 html(" "); 68 html(" ");
68 html_txt(info->tagger_email); 69 html_txt(info->tagger_email);
69 } 70 }
70 html("</td></tr>\n"); 71 html("</td></tr>\n");
71 } 72 }
72 html("<tr><td>Tagged object</td><td>"); 73 html("<tr><td>Tagged object</td><td>");
73 cgit_object_link(tag->tagged); 74 cgit_object_link(tag->tagged);
74 html("</td></tr>\n"); 75 html("</td></tr>\n");
75 html("</table>\n"); 76 html("</table>\n");
76 print_tag_content(info->msg); 77 print_tag_content(info->msg);
77 } 78 }
78 return; 79 return;
79} 80}