1 files changed, 30 insertions, 12 deletions

diff --git a/ui-log.c b/ui-log.c
index 05b5c29..8add66a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -93,13 +93,13 @@ void show_commit_decorations(struct commit *commit)
 }
 
 void print_commit(struct commit *commit, struct rev_info *revs)
 {
         struct commitinfo *info;
         char *tmp;
-        int cols = 2;
+        int cols = revs->graph ? 3 : 2;
         struct strbuf graphbuf = STRBUF_INIT;
         struct strbuf msgbuf = STRBUF_INIT;
 
         if (ctx.repo->enable_log_filecount) {
                 cols++;
                 if (ctx.repo->enable_log_linecount)
@@ -107,37 +107,39 @@ void print_commit(struct commit *commit, struct rev_info *revs)
         }
 
         if (revs->graph) {
                 /* Advance graph until current commit */
                 while (!graph_next_line(revs->graph, &graphbuf)) {
                         /* Print graph segment in otherwise empty table row */
-                        html("<tr class='nohover'><td/><td class='commitgraph'>");
+                        html("<tr class='nohover'><td class='commitgraph'>");
                         html(graphbuf.buf);
                         htmlf("</td><td colspan='%d' /></tr>\n", cols);
                         strbuf_setlen(&graphbuf, 0);
                 }
                 /* Current commit's graph segment is now ready in graphbuf */
         }
 
         info = cgit_parse_commit(commit);
-        htmlf("<tr%s><td>",
-                ctx.qry.showmsg ? " class='logheader'" : "");
-        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();
-        html("</td>");
+        htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : "");
 
         if (revs->graph) {
                 /* Print graph segment for current commit */
                 html("<td class='commitgraph'>");
                 html(graphbuf.buf);
                 html("</td>");
                 strbuf_setlen(&graphbuf, 0);
         }
+        else {
+                html("<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();
+                html("</td>");
+        }
 
         htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : "");
         if (ctx.qry.showmsg) {
                 /* line-wrap long commit subjects instead of truncating them */
                 size_t subject_len = strlen(info->subject);
 
@@ -164,12 +166,22 @@ void print_commit(struct commit *commit, struct rev_info *revs)
         }
         cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
                          sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
         show_commit_decorations(commit);
         html("</td><td>");
         html_txt(info->author);
+
+        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) {
                 files = 0;
                 add_lines = 0;
                 rem_lines = 0;
                 cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
                 html("</td><td>");
@@ -179,13 +191,13 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                         htmlf("-%d/+%d", rem_lines, add_lines);
                 }
         }
         html("</td></tr>\n");
 
         if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
-                html("<tr class='nohover'><td/>"); /* Empty 'Age' column */
+                html("<tr class='nohover'>");
 
                 if (ctx.qry.showmsg) {
                         /* Concatenate commit message + notes in msgbuf */
                         if (info->msg && *(info->msg)) {
                                 strbuf_addstr(&msgbuf, info->msg);
                                 strbuf_addch(&msgbuf, '\n');
@@ -220,12 +232,14 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                                 graph_next_line(revs->graph, &graphbuf);
                                 html(graphbuf.buf);
                                 lines--;
                         }
                         html("</td>\n");
                 }
+                else
+                        html("<td/>"); /* Empty 'Age' column */
 
                 /* Print msgbuf into remainder of table row */
                 htmlf("<td colspan='%d'%s>\n", cols,
                         ctx.qry.showmsg ? " class='logmsg'" : "");
                 html_txt(msgbuf.buf);
                 html("</td></tr>\n");
@@ -342,25 +356,29 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         compile_grep_patterns(&rev.grep_filter);
         prepare_revision_walk(&rev);
 
         if (pager)
                 html("<table class='list nowrap'>");
 
-        html("<tr class='nohover'><th class='left'>Age</th>");
+        html("<tr class='nohover'>");
         if (commit_graph)
                 html("<th></th>");
+        else
+                html("<th class='left'>Age</th>");
         html("<th class='left'>Commit message");
         if (pager) {
                 html(" (");
                 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
                               NULL, ctx.qry.head, ctx.qry.sha1,
                               ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
                               ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
                 html(")");
         }
         html("</th><th class='left'>Author</th>");
+        if (commit_graph)
+                html("<th class='left'>Age</th>");
         if (ctx.repo->enable_log_filecount) {
                 html("<th class='left'>Files</th>");
                 columns++;
                 if (ctx.repo->enable_log_linecount) {
                         html("<th class='left'>Lines</th>");
                         columns++;