7 files changed, 31 insertions, 18 deletions

diff --git a/cgit.c b/cgit.c
index 1c213c7..f5135d9 100644
--- a/cgit.c
+++ b/cgit.c
@@ -79,49 +79,49 @@ static void cgit_print_repo_page(struct cacheitem *item)
                 return;
         }
 
         show_search = (cgit_cmd == CMD_LOG);
         cgit_print_docstart(title, item);
         if (!cgit_cmd) {
                 cgit_print_pageheader("summary", show_search);
                 cgit_print_summary();
                 cgit_print_docend();
                 return;
         }
 
         cgit_print_pageheader(cgit_query_page, show_search);
 
         switch(cgit_cmd) {
         case CMD_LOG:
                 cgit_print_log(cgit_query_head, cgit_query_ofs,
                                cgit_max_commit_count, cgit_query_search,
                                cgit_query_path, 1);
                 break;
         case CMD_TREE:
                 cgit_print_tree(cgit_query_sha1, cgit_query_path);
                 break;
         case CMD_COMMIT:
-                cgit_print_commit(cgit_query_head);
+                cgit_print_commit(cgit_query_sha1);
                 break;
         case CMD_DIFF:
                 cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2,
                                 cgit_query_path);
                 break;
         default:
                 cgit_print_error("Invalid request");
         }
         cgit_print_docend();
 }
 
 static void cgit_fill_cache(struct cacheitem *item, int use_cache)
 {
         static char buf[PATH_MAX];
         int stdout2;
 
         getcwd(buf, sizeof(buf));
         item->st.st_mtime = time(NULL);
 
         if (use_cache) {
                 stdout2 = chk_positive(dup(STDOUT_FILENO),
                                        "Preserving STDOUT");
                 chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
                 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
diff --git a/cgit.h b/cgit.h
index b2f6361..c276a24 100644
--- a/cgit.h
+++ b/cgit.h
@@ -184,48 +184,50 @@ extern void html_link_close(void);
 extern void html_filemode(unsigned short mode);
 extern int html_include(const char *filename);
 
 extern int cgit_read_config(const char *filename, configfn fn);
 extern int cgit_parse_query(char *txt, configfn fn);
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern void cgit_parse_url(const char *url);
 
 extern char *cache_safe_filename(const char *unsafe);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
 extern int cache_cancel_lock(struct cacheitem *item);
 extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_pageurl(const char *reponame, const char *pagename,
                           const char *query);
 
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
                            char *rev, char *path);
 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);
 
 extern void cgit_print_error(char *msg);
 extern void cgit_print_date(time_t secs, char *format);
 extern void cgit_print_age(time_t t, time_t max_relative, char *format);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title, int show_search);
 extern void cgit_print_snapshot_start(const char *mimetype,
                                       const char *filename,
                                       struct cacheitem *item);
 
 extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();
 extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager);
 extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
 extern void cgit_print_tree(const char *rev, char *path);
 extern void cgit_print_commit(const char *hex);
 extern void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex,
                             char *path);
 extern void cgit_print_snapshot(struct cacheitem *item, const char *hex,
                                 const char *format, const char *prefix,
                                 const char *filename);
 
 #endif /* CGIT_H */
diff --git a/ui-commit.c b/ui-commit.c
index 885f870..8864fc6 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -135,48 +135,51 @@ void inspect_filepair(struct diff_filepair *pair)
         items[files-1].old_mode = pair->one->mode;
         items[files-1].new_mode = pair->two->mode;
         items[files-1].old_path = xstrdup(pair->one->path);
         items[files-1].new_path = xstrdup(pair->two->path);
         items[files-1].added = lines_added;
         items[files-1].removed = lines_removed;
         if (lines_added + lines_removed > max_changes)
                 max_changes = lines_added + lines_removed;
         total_adds += lines_added;
         total_rems += lines_removed;
 }
 
 
 void cgit_print_commit(const char *hex)
 {
         struct commit *commit, *parent;
         struct commitinfo *info;
         struct commit_list *p;
         unsigned char sha1[20];
         char *query;
         char *filename;
         char *tmp;
         int i;
 
+        if (!hex)
+                hex = cgit_query_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);
 
         html("<table 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);
         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'>");
diff --git a/ui-log.c b/ui-log.c
index bb17e1d..8d774b0 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -10,53 +10,50 @@
 
 int files, lines;
 
 void count_lines(char *line, int size)
 {
         if (size>0 && (line[0] == '+' || line[0] == '-'))
                 lines++;
 }
 
 void inspect_files(struct diff_filepair *pair)
 {
         files++;
         if (cgit_repo->enable_log_linecount)
                 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 
 void print_commit(struct commit *commit)
 {
         struct commitinfo *info;
 
         info = cgit_parse_commit(commit);
         html("<tr><td>");
         cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
         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) {
                 files = 0;
                 lines = 0;
                 cgit_diff_commit(commit, inspect_files);
                 html("</td><td class='right'>");
                 htmlf("%d", files);
                 if (cgit_repo->enable_log_linecount) {
                         html("</td><td class='right'>");
                         htmlf("%d", lines);
                 }
         }
         html("</td><td>");
         html_txt(info->author);
         html("</td></tr>\n");
         cgit_free_commitinfo(info);
 }
 
 
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager)
 {
         struct rev_info rev;
         struct commit *commit;
         const char *argv[] = {NULL, tip, NULL, NULL, NULL};
         int argc = 2;
diff --git a/ui-shared.c b/ui-shared.c
index 64ee79c..71c899a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -115,76 +115,88 @@ static char *repolink(char *title, char *class, char *page, char *head,
                 html("/");
                 if (path)
                         html_attr(path);
         } else {
                 html(cgit_script_name);
                 html("?url=");
                 html_attr(cgit_repo->url);
                 if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
                         html("/");
                 html(page);
                 html("/");
                 if (path)
                         html_attr(path);
                 delim = "&amp;";
         }
         if (head && strcmp(head, cgit_repo->defbranch)) {
                 html(delim);
                 html("h=");
                 html_attr(head);
                 delim = "&amp;";
         }
         return fmt("%s", delim);
 }
 
-static char *reporevlink(char *page, char *name, char *title, char *class,
-                         char *head, char *rev, char *path)
+static void reporevlink(char *page, char *name, char *title, char *class,
+                        char *head, char *rev, char *path)
 {
         char *delim;
 
         delim = repolink(title, class, page, head, path);
         if (rev && strcmp(rev, cgit_query_head)) {
                 html(delim);
                 html("id=");
                 html_attr(rev);
         }
         html("'>");
         html_txt(name);
         html("</a>");
 }
 
 void cgit_tree_link(char *name, char *title, char *class, char *head,
                     char *rev, char *path)
 {
         reporevlink("tree", name, title, class, head, rev, path);
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
                    char *rev, char *path)
 {
         reporevlink("log", name, title, class, head, rev, path);
 }
 
+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)
 {
         char buf[64];
         struct tm *time;
 
         time = gmtime(&secs);
         strftime(buf, sizeof(buf)-1, format, time);
         html_txt(buf);
 }
 
 void cgit_print_age(time_t t, time_t max_relative, char *format)
 {
         time_t now, secs;
 
         time(&now);
         secs = now - t;
 
         if (secs > max_relative && max_relative >= 0) {
                 cgit_print_date(t, format);
                 return;
         }
 
         if (secs < TM_HOUR * 2) {
                 htmlf("<span class='age-mins'>%.0f min.</span>",
diff --git a/ui-summary.c b/ui-summary.c
index 29b76e3..03dd078 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,82 +1,82 @@
 /* ui-summary.c: functions for generating repo summary page
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 static int header;
 
 static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                                 int flags, void *cb_data)
 {
         struct commit *commit;
         struct commitinfo *info;
-        char buf[256], *url;
+        char buf[256];
+        char *ref;
 
+        ref = xstrdup(refname);
         strncpy(buf, refname, sizeof(buf));
         commit = lookup_commit(sha1);
         // object is not really parsed at this point, because of some fallout
         // from previous calls to git functions in cgit_print_log()
         commit->object.parsed = 0;
         if (commit && !parse_commit(commit)){
                 info = cgit_parse_commit(commit);
                 html("<tr><td>");
-                cgit_log_link(refname, NULL, NULL, refname, NULL, NULL);
+                cgit_log_link(ref, NULL, NULL, ref, NULL, NULL);
                 html("</td><td>");
                 cgit_print_age(commit->date, -1, NULL);
                 html("</td><td>");
                 html_txt(info->author);
                 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");
                 cgit_free_commitinfo(info);
         } else {
                 html("<tr><td>");
                 html_txt(buf);
                 html("</td><td colspan='3'>");
                 htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
                 html("</td></tr>\n");
         }
+        free(ref);
         return 0;
 }
 
 
 static void cgit_print_object_ref(struct object *obj)
 {
         char *page, *arg, *url;
 
         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) {
                 page = "tree";
                 arg = "id";
         } else {
                 page = "view";
                 arg = "id";
         }
 
         url = cgit_pageurl(cgit_query_repo, page,
                            fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
         html_link_open(url, NULL, NULL);
         htmlf("%s %s", typename(obj->type),
               sha1_to_hex(obj->sha1));
         html_link_close();
 }
 
 static void print_tag_header()
 {
         html("<tr class='nohover'><th class='left'>Tag</th>"
              "<th class='left'>Age</th>"
              "<th class='left'>Author</th>"
              "<th class='left'>Reference</th></tr>\n");
         header = 1;
 }
diff --git a/ui-tree.c b/ui-tree.c
index e16b638..1037c82 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -37,49 +37,48 @@ static void print_object(const unsigned char *sha1, char *path)
         start = 0;
         lineno = 0;
         while(idx < size) {
                 if (buf[idx] == '\n') {
                         buf[idx] = '\0';
                         htmlf("<tr><td class='no'>%d</td><td class='txt'>",
                               ++lineno);
                         html_txt(buf + start);
                         html("</td></tr>\n");
                         start = idx + 1;
                 }
                 idx++;
         }
         html("</table>\n");
 }
 
 
 static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                    const char *pathname, unsigned int mode, int stage)
 {
         char *name;
         char *fullpath;
         enum object_type type;
         unsigned long size = 0;
-        char *url, *qry;
 
         name = xstrdup(pathname);
         fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
                        cgit_query_path ? "/" : "", name);
 
         type = sha1_object_info(sha1, &size);
         if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
                 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                       name,
                       sha1_to_hex(sha1));
                 return 0;
         }
 
         html("<tr><td class='ls-mode'>");
         html_filemode(mode);
         html("</td><td>");
         if (S_ISDIRLNK(mode)) {
                 htmlf("<a class='ls-mod' href='");
                 html_attr(fmt(cgit_repo->module_link,
                               name,
                               sha1_to_hex(sha1)));
                 html("'>");
                 html_txt(name);
                 html("</a>");