From 0027e38b40b8ef11dac6326a4e610728bae88247 Mon Sep 17 00:00:00 2001
From: Justin Waters
Date: Mon, 12 Jan 2009 10:23:28 -0500
Subject: Add decorations to commit pages

This adds the tag and branch head decorations to the commit pages.  This is
similar to how commits are displayed in the standard gitweb interface.

Signed-off-by: Justin Waters <justin.waters@timesys.com>
---
 ui-commit.c | 4 ++++
 ui-log.h    | 1 +
 2 files changed, 5 insertions(+)

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 */
-- 
cgit v1.2.3-2-gb3c3


From 236665d70d142dcb822efce84c3021dd6ac5df13 Mon Sep 17 00:00:00 2001
From: Lars Hjemli
Date: Tue, 27 Jan 2009 22:42:03 +0100
Subject: cgit.css: minor adjustment of commit decorations

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
 cgit.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cgit.css b/cgit.css
index f19446d..be3b1d0 100644
--- a/cgit.css
+++ b/cgit.css
@@ -495,3 +495,8 @@ a.deco {
 	background-color: #ff8888;
 	border: solid 1px #770000;
 }
+
+div.commit-subject a {
+	margin-left: 1em;
+	font-size: 75%;
+}
-- 
cgit v1.2.3-2-gb3c3


From 38fde35f9a28263e3e89dc9504cb8fb72d98a748 Mon Sep 17 00:00:00 2001
From: Lars Hjemli
Date: Tue, 27 Jan 2009 22:59:23 +0100
Subject: tests/t0105-commit.sh: expect commit decorations

When a commit is referenced by a branch or tag the commit subject-
line will be suffixed with the proper decorations, hence the test
for this line needs to be updated.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
 tests/t0105-commit.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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'
-- 
cgit v1.2.3-2-gb3c3