4 files changed, 12 insertions, 1 deletions

diff --git a/cgit.css b/cgit.css
index f844efa..957d5aa 100644
--- a/cgit.css
+++ b/cgit.css
@@ -311,268 +311,274 @@ table.diffstat th {
         font-weight: normal;
         text-align: left;
         text-decoration: underline;
         padding: 0.1em 1em 0.1em 0.1em;
         font-size: 100%;
 }
 
 table.diffstat td {
         padding: 0.2em 0.2em 0.1em 0.1em;
         font-size: 100%;
         border: none;
 }
 
 table.diffstat td.mode {
         white-space: nowrap;
 }
 
 table.diffstat td span.modechange {
         padding-left: 1em;
         color: red;
 }
 
 table.diffstat td.add a {
         color: green;
 }
 
 table.diffstat td.del a {
         color: red;
 }
 
 table.diffstat td.upd a {
         color: blue;
 }
 
 table.diffstat td.graph {
         width: 500px;
         vertical-align: middle;
 }
 
 table.diffstat td.graph table {
         border: none;
 }
 
 table.diffstat td.graph td {
         padding: 0px;
         border: 0px;
         height: 7pt;
 }
 
 table.diffstat td.graph td.add {
         background-color: #5c5;
 }
 
 table.diffstat td.graph td.rem {
         background-color: #c55;
 }
 
 div.diffstat-summary {
         color: #888;
         padding-top: 0.5em;
 }
 
 table.diff {
         width: 100%;
 }
 
 table.diff td {
         font-family: monospace;
         white-space: pre;
 }
 
 table.diff td div.head {
         font-weight: bold;
         margin-top: 1em;
         color: black;
 }
 
 table.diff td div.hunk {
         color: #009;
 }
 
 table.diff td div.add {
         color: green;
 }
 
 table.diff td div.del {
         color: red;
 }
 
 .sha1 {
         font-family: monospace;
         font-size: 90%;
 }
 
 .left {
         text-align: left;
 }
 
 .right {
         text-align: right;
 }
 
 table.list td.repogroup {
         font-style: italic;
         color: #888;
 }
 
 a.button {
         font-size: 80%;
         padding: 0em 0.5em;
 }
 
 a.primary {
         font-size: 100%;
 }
 
 a.secondary {
         font-size: 90%;
 }
 
 td.toplevel-repo {
 
 }
 
 table.list td.sublevel-repo {
         padding-left: 1.5em;
 }
 
 div.pager {
         text-align: center;
         margin: 1em 0em 0em 0em;
 }
 
 div.pager a {
         color: #777;
         margin: 0em 0.5em;
 }
 
 span.age-mins {
         font-weight: bold;
         color: #080;
 }
 
 span.age-hours {
         color: #080;
 }
 
 span.age-days {
         color: #040;
 }
 
 span.age-weeks {
         color: #444;
 }
 
 span.age-months {
         color: #888;
 }
 
 span.age-years {
         color: #bbb;
 }
 div.footer {
         margin-top: 0.5em;
         text-align: center;
         font-size: 80%;
         color: #ccc;
 }
 a.branch-deco {
         margin: 0px 0.5em;
         padding: 0px 0.25em;
         background-color: #88ff88;
         border: solid 1px #007700;
 }
 a.tag-deco {
         margin: 0px 0.5em;
         padding: 0px 0.25em;
         background-color: #ffff88;
         border: solid 1px #777700;
 }
 a.remote-deco {
         margin: 0px 0.5em;
         padding: 0px 0.25em;
         background-color: #ccccff;
         border: solid 1px #000077;
 }
 a.deco {
         margin: 0px 0.5em;
         padding: 0px 0.25em;
         background-color: #ff8888;
         border: solid 1px #770000;
 }
+
+div.commit-subject a {
+        margin-left: 1em;
+        font-size: 75%;
+}
+
 table.stats {
         border: solid 1px black;
         border-collapse: collapse;
 }
 
 table.stats th {
         text-align: left;
         padding: 1px 0.5em;
         background-color: #eee;
         border: solid 1px black;
 }
 
 table.stats td {
         text-align: right;
         padding: 1px 0.5em;
         border: solid 1px black;
 }
 
 table.stats td.total {
         font-weight: bold;
         text-align: left;
 }
 
 table.stats td.sum {
         color: #c00;
         font-weight: bold;
         /*background-color: #eee; */
 }
 
 table.stats td.left {
         text-align: left;
 }
 
 table.vgraph {
         border-collapse: separate;
         border: solid 1px black;
         height: 200px;
 }
 
 table.vgraph th {
         background-color: #eee;
         font-weight: bold;
         border: solid 1px white;
         padding: 1px 0.5em;
 }
 
 table.vgraph td {
         vertical-align: bottom;
         padding: 0px 10px;
 }
 
 table.vgraph div.bar {
         background-color: #eee;
 }
 
 table.hgraph {
         border: solid 1px black;
         width: 800px;
 }
 
 table.hgraph th {
         background-color: #eee;
         font-weight: bold;
         border: solid 1px black;
         padding: 1px 0.5em;
 }
 
 table.hgraph td {
         vertical-align: center;
         padding: 2px 2px;
 }
 
 table.hgraph div.bar {
         background-color: #eee;
         height: 1em;
 }
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh
index a864612..ae794c8 100755
--- a/tests/t0105-commit.sh
+++ b/tests/t0105-commit.sh
@@ -1,37 +1,37 @@
 #!/bin/sh
 
 . ./setup.sh
 
 prepare_tests "Check content on commit page"
 
 run_test 'generate foo/commit' 'cgit_url "foo/commit" >trash/tmp'
 run_test 'find tree link' 'grep -e "<a href=./foo/tree/.>" trash/tmp'
 run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp'
 
 run_test 'find commit subject' '
-        grep -e "<div class=.commit-subject.>commit 5</div>" trash/tmp
+        grep -e "<div class=.commit-subject.>commit 5<" trash/tmp
 '
 
 run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp'
 run_test 'find diffstat' 'grep -e "<table summary=.diffstat. class=.diffstat.>" trash/tmp'
 
 run_test 'find diff summary' '
          grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp
 '
 
 run_test 'get root commit' '
          root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) &&
          cgit_url "foo/commit&id=$root" >trash/tmp &&
          grep "</html>" trash/tmp
 '
 
 run_test 'root commit contains diffstat' '
          grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" trash/tmp
 '
 
 run_test 'root commit contains diff' '
          grep ">diff --git a/file-1 b/file-1<" trash/tmp &&
          grep -e "<div class=.add.>+1</div>" trash/tmp
 '
 
 tests_done
diff --git a/ui-commit.c b/ui-commit.c
index a6a85a4..41ce70e 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,102 +1,106 @@
 /* ui-commit.c: generate commit view
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-diff.h"
+#include "ui-log.h"
 
 void cgit_print_commit(char *hex)
 {
         struct commit *commit, *parent;
         struct commitinfo *info;
         struct commit_list *p;
         unsigned char sha1[20];
         char *tmp;
         int parents = 0;
 
         if (!hex)
                 hex = ctx.qry.head;
 
         if (get_sha1(hex, sha1)) {
                 cgit_print_error(fmt("Bad object id: %s", hex));
                 return;
         }
         commit = lookup_commit_reference(sha1);
         if (!commit) {
                 cgit_print_error(fmt("Bad commit reference: %s", hex));
                 return;
         }
         info = cgit_parse_commit(commit);
 
+        load_ref_decorations();
+
         html("<table summary='commit info' class='commit-info'>\n");
         html("<tr><th>author</th><td>");
         html_txt(info->author);
         html(" ");
         html_txt(info->author_email);
         html("</td><td class='right'>");
         cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
         html("</td></tr>\n");
         html("<tr><th>committer</th><td>");
         html_txt(info->committer);
         html(" ");
         html_txt(info->committer_email);
         html("</td><td class='right'>");
         cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
         html("</td></tr>\n");
         html("<tr><th>commit</th><td colspan='2' class='sha1'>");
         tmp = sha1_to_hex(commit->object.sha1);
         cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp);
         html(" (");
         cgit_patch_link("patch", NULL, NULL, NULL, tmp);
         html(")</td></tr>\n");
         html("<tr><th>tree</th><td colspan='2' class='sha1'>");
         tmp = xstrdup(hex);
         cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
                        ctx.qry.head, tmp, NULL);
         html("</td></tr>\n");
               for (p = commit->parents; p ; p = p->next) {
                 parent = lookup_commit_reference(p->item->object.sha1);
                 if (!parent) {
                         html("<tr><td colspan='3'>");
                         cgit_print_error("Error reading parent commit");
                         html("</td></tr>");
                         continue;
                 }
                 html("<tr><th>parent</th>"
                      "<td colspan='2' class='sha1'>");
                 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
                                  ctx.qry.head, sha1_to_hex(p->item->object.sha1));
                 html(" (");
                 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
                                sha1_to_hex(p->item->object.sha1), NULL);
                 html(")</td></tr>");
                 parents++;
         }
         if (ctx.repo->snapshots) {
                 html("<tr><th>download</th><td colspan='2' class='sha1'>");
                 cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
                                           hex, ctx.repo->snapshots);
                 html("</td></tr>");
         }
         html("</table>\n");
         html("<div class='commit-subject'>");
         html_txt(info->subject);
+        show_commit_decorations(commit);
         html("</div>");
         html("<div class='commit-msg'>");
         html_txt(info->msg);
         html("</div>");
         if (parents < 3) {
                 if (parents)
                         tmp = sha1_to_hex(commit->parents->item->object.sha1);
                 else
                         tmp = NULL;
                 cgit_print_diff(ctx.qry.sha1, tmp, NULL);
         }
         cgit_free_commitinfo(info);
 }
diff --git a/ui-log.h b/ui-log.h
index 877e40e..6034055 100644
--- a/ui-log.h
+++ b/ui-log.h
@@ -1,7 +1,8 @@
 #ifndef UI_LOG_H
 #define UI_LOG_H
 
 extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
                            char *pattern, char *path, int pager);
+extern void show_commit_decorations(struct commit *commit);
 
 #endif /* UI_LOG_H */