]> git.cameronkatri.com Git - cgit.git/commitdiff
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Thu, 2 Jun 2011 10:33:23 +0000 (10:33 +0000)
committerLars Hjemli <hjemli@gmail.com>
Thu, 2 Jun 2011 10:33:23 +0000 (10:33 +0000)
1  2 
ui-log.c
ui-snapshot.c

diff --cc ui-log.c
index 2e6e9d66125064c3737954ef7420240c28d26eeb,15ed6a3f63dabea9cad60ae645b1450178dc274e..4a295bd4a484bb86ba3373a07a62f3b2ed4b1d35
+++ b/ui-log.c
@@@ -171,14 -167,10 +166,10 @@@ void print_commit(struct commit *commit
  
        if (revs->graph) {
                html("</td><td>");
-               tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
-               tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
-               html_link_open(tmp, NULL, NULL);
                cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
-               html_link_close();
        }
  
 -      if (ctx.repo->enable_log_filecount) {
 +      if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) {
                files = 0;
                add_lines = 0;
                rem_lines = 0;
diff --cc ui-snapshot.c
Simple merge