2 files changed, 32 insertions, 13 deletions

diff --git a/cgit.css b/cgit.css
index 97ae4d1..53c93f2 100644
--- a/cgit.css
+++ b/cgit.css
@@ -289,29 +289,28 @@ table.diffstat td.graph img {
         height: 8pt;
 }
 
 div.diffstat-summary {
         color: #888;
         padding-top: 0.5em;
 }
 
-table.diff th {
-        padding: 1em 0em 0.1em 0.1em;
-        text-align: left;
-}
-
 table.diff td {
-        border: solid 1px black;
         font-family: monospace;
         white-space: pre;
 }
 
+table.diff td div.head {
+        font-weight: bold;
+        padding-top: 1em;
+}
+
 table.diff td div.hunk {
-        background: #ccc;
+        color: #009;
 }
 
 table.diff td div.add {
         color: green;
 }
 
 table.diff td div.del {
         color: red;
diff --git a/ui-diff.c b/ui-diff.c
index 10330d3..7ec5701 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -26,22 +26,43 @@ static void print_line(char *line, int len)
 
         htmlf("<div class='%s'>", class);
         line[len-1] = '\0';
         html_txt(line);
         html("</div>");
         line[len-1] = c;
 }
 
-static void filepair_cb(struct diff_filepair *pair)
+static void header(unsigned char *sha1, char *path1,
+                   unsigned char *sha2, char *path2)
 {
-        html("<tr><th>");
-        html_txt(pair->two->path);
-        html("</th></tr>");
+        char *abbrev1, *abbrev2;
+
         html("<tr><td>");
+        html("<div class='head'>");
+        html("diff --git a/");
+        html_txt(path1);
+        html(" b/");
+        html_txt(path2);
+        abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
+        abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
+        htmlf("\nindex %s..%s", abbrev1, abbrev2);
+        free(abbrev1);
+        free(abbrev2);
+        html("\n--- a/");
+        html_txt(path1);
+        html("\n+++ b/");
+        html_txt(path2);
+        html("</div>");
+}
+
+static void filepair_cb(struct diff_filepair *pair)
+{
+        header(pair->one->sha1, pair->one->path,
+               pair->two->sha1, pair->two->path);
         if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
                 cgit_print_error("Error running diff");
         html("</tr></td>");
 }
 
 void cgit_print_diff(const char *old_hex, const char *new_hex, char *path)
 {
         unsigned char sha1[20], sha2[20];
@@ -58,19 +79,18 @@ void cgit_print_diff(const char *old_hex, const char *new_hex, char *path)
                         cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
                         return;
                 }
         }
 
         html("<table class='diff'>");
         switch(type) {
         case OBJ_BLOB:
-                if (path)
-                        htmlf("<tr><th>%s</th></tr>", path);
                 html("<tr><td>");
+                header(sha1, path, sha2, path);
                 if (cgit_diff_files(sha1, sha2, print_line))
                         cgit_print_error("Error running diff");
                 html("</tr></td>");
                 break;
         case OBJ_TREE:
                 cgit_diff_tree(sha1, sha2, filepair_cb);
                 break;
         default: