From 4a198e4b8ee62a9a8b5156a46bfce46dc7223fe9 Mon Sep 17 00:00:00 2001 From: Ragnar Ouchterlony Date: Wed, 16 Sep 2009 18:56:26 +0200 Subject: 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 Signed-off-by: Lars Hjemli --- ui-ssdiff.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ui-ssdiff.c') diff --git a/ui-ssdiff.c b/ui-ssdiff.c index 8215051..5673642 100644 --- a/ui-ssdiff.c +++ b/ui-ssdiff.c @@ -108,6 +108,8 @@ static void print_ssdiff_line(char *class, int old_line_no, char *old_line, if (old_line_no > 0) htmlf("%d", old_line_no, class); + else if (old_line) + htmlf("", class); else htmlf("", class); @@ -122,6 +124,8 @@ static void print_ssdiff_line(char *class, int old_line_no, char *old_line, if (new_line_no > 0) htmlf("%d", new_line_no, class); + else if (new_line) + htmlf("", class); else htmlf("", class); @@ -251,8 +255,8 @@ void cgit_ssdiff_line_cb(char *line, int len) void cgit_ssdiff_header_begin() { - current_old_line = 0; - current_new_line = 0; + current_old_line = -1; + current_new_line = -1; html("
"); html(""); } -- cgit v1.2.1