summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.c2
-rw-r--r--cgit.h2
-rw-r--r--ui-commit.c3
-rw-r--r--ui-log.c7
-rw-r--r--ui-shared.c14
-rw-r--r--ui-summary.c18
-rw-r--r--ui-tree.c1
7 files changed, 30 insertions, 17 deletions
diff --git a/cgit.c b/cgit.c
index 1c213c7..f5135d9 100644
--- a/cgit.c
+++ b/cgit.c
@@ -102,3 +102,3 @@ static void cgit_print_repo_page(struct cacheitem *item)
case CMD_COMMIT:
- cgit_print_commit(cgit_query_head);
+ cgit_print_commit(cgit_query_sha1);
break;
diff --git a/cgit.h b/cgit.h
index b2f6361..c276a24 100644
--- a/cgit.h
+++ b/cgit.h
@@ -207,2 +207,4 @@ extern void cgit_log_link(char *name, char *title, char *class, char *head,
char *rev, char *path);
+extern void cgit_commit_link(char *name, char *title, char *class, char *head,
+ char *rev);
diff --git a/ui-commit.c b/ui-commit.c
index 885f870..8864fc6 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -158,2 +158,5 @@ void cgit_print_commit(const char *hex)
+ if (!hex)
+ hex = cgit_query_head;
+
if (get_sha1(hex, sha1)) {
diff --git a/ui-log.c b/ui-log.c
index bb17e1d..8d774b0 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -33,7 +33,4 @@ void print_commit(struct commit *commit)
html("</td><td>");
- char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1));
- char *url = cgit_pageurl(cgit_query_repo, "commit", qry);
- html_link_open(url, NULL, NULL);
- html_ntxt(cgit_max_msg_len, info->subject);
- html_link_close();
+ cgit_commit_link(info->subject, NULL, NULL, cgit_query_head,
+ sha1_to_hex(commit->object.sha1));
if (cgit_repo->enable_log_filecount) {
diff --git a/ui-shared.c b/ui-shared.c
index 64ee79c..71c899a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -138,3 +138,3 @@ static char *repolink(char *title, char *class, char *page, char *head,
-static char *reporevlink(char *page, char *name, char *title, char *class,
+static void reporevlink(char *page, char *name, char *title, char *class,
char *head, char *rev, char *path)
@@ -166,2 +166,14 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
+void cgit_commit_link(char *name, char *title, char *class, char *head,
+ char *rev)
+{
+ if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) {
+ name[cgit_max_msg_len] = '\0';
+ name[cgit_max_msg_len - 1] = '.';
+ name[cgit_max_msg_len - 2] = '.';
+ name[cgit_max_msg_len - 3] = '.';
+ }
+ reporevlink("commit", name, title, class, head, rev, NULL);
+}
+
void cgit_print_date(time_t secs, char *format)
diff --git a/ui-summary.c b/ui-summary.c
index 29b76e3..03dd078 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -17,4 +17,6 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
struct commitinfo *info;
- char buf[256], *url;
+ char buf[256];
+ char *ref;
+ ref = xstrdup(refname);
strncpy(buf, refname, sizeof(buf));
@@ -27,3 +29,3 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
html("<tr><td>");
- cgit_log_link(refname, NULL, NULL, refname, NULL, NULL);
+ cgit_log_link(ref, NULL, NULL, ref, NULL, NULL);
html("</td><td>");
@@ -33,7 +35,3 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
html("</td><td>");
- url = cgit_pageurl(cgit_query_repo, "commit",
- fmt("h=%s", sha1_to_hex(sha1)));
- html_link_open(url, NULL, NULL);
- html_ntxt(cgit_max_msg_len, info->subject);
- html_link_close();
+ cgit_commit_link(info->subject, NULL, NULL, ref, NULL);
html("</td></tr>\n");
@@ -47,2 +45,3 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
}
+ free(ref);
return 0;
@@ -56,4 +55,5 @@ static void cgit_print_object_ref(struct object *obj)
if (obj->type == OBJ_COMMIT) {
- page = "commit";
- arg = "h";
+ cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
+ cgit_query_head, sha1_to_hex(obj->sha1));
+ return;
} else if (obj->type == OBJ_TREE) {
diff --git a/ui-tree.c b/ui-tree.c
index e16b638..1037c82 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -60,3 +60,2 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
unsigned long size = 0;
- char *url, *qry;