Fixed side-by-side diff bugs related to binary diff and more.

The fixed bugs:

 * "Binary files differ" did not show up either in unidiff or
   side-by-side-diff.
 * Subproject diffs did not work for side-by-side diffs.
 * The ssdiff link on diff pages did not conserve the path.

Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 8215051..5673642 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -105,12 +105,14 @@ static void print_ssdiff_line(char *class, int old_line_no, char *old_line,
                               int new_line_no, char *new_line)
 {
         html("<tr>");
         if (old_line_no > 0)
                 htmlf("<td class='lineno'>%d</td><td class='%s'>",
                       old_line_no, class);
+        else if (old_line)
+                htmlf("<td class='lineno'></td><td class='%s'>", class);
         else
                 htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
 
         if (old_line) {
                 old_line = replace_tabs(old_line + 1);
                 html_txt(old_line);
@@ -119,12 +121,14 @@ static void print_ssdiff_line(char *class, int old_line_no, char *old_line,
 
         html("</td>");
 
         if (new_line_no > 0)
                 htmlf("<td class='lineno'>%d</td><td class='%s'>",
                       new_line_no, class);
+        else if (new_line)
+                htmlf("<td class='lineno'></td><td class='%s'>", class);
         else
                 htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
 
         if (new_line) {
                 new_line = replace_tabs(new_line + 1);
                 html_txt(new_line);
@@ -248,14 +252,14 @@ void cgit_ssdiff_line_cb(char *line, int len)
         }
         line[len - 1] = c;
 }
 
 void cgit_ssdiff_header_begin()
 {
-        current_old_line = 0;
-        current_new_line = 0;
+        current_old_line = -1;
+        current_new_line = -1;
         html("<tr><td class='space' colspan='4'><div></div></td></tr>");
         html("<tr><td class='head' colspan='4'>");
 }
 
 void cgit_ssdiff_header_end()
 {