Merge branch 'jw/commit-decorations'

Conflicts:
	cgit.css

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

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
@@ -500,6 +500,12 @@ a.deco {
         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;
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
@@ -9,7 +9,7 @@ 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'
diff --git a/ui-commit.c b/ui-commit.c
index a6a85a4..41ce70e 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -10,6 +10,7 @@
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-diff.h"
+#include "ui-log.h"
 
 void cgit_print_commit(char *hex)
 {
@@ -34,6 +35,8 @@ void cgit_print_commit(char *hex)
         }
         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);
@@ -87,6 +90,7 @@ void cgit_print_commit(char *hex)
         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);
diff --git a/ui-log.h b/ui-log.h
index 877e40e..6034055 100644
--- a/ui-log.h
+++ b/ui-log.h
@@ -3,5 +3,6 @@
 
 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 */