| author | Ragnar Ouchterlony <ragnar@lysator.liu.se> | 2009-09-16 16:56:26 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-09-16 18:17:56 (UTC) |
| commit | 4a198e4b8ee62a9a8b5156a46bfce46dc7223fe9 (patch) (side-by-side diff) | |
| tree | c6389de8ae75cf907ed3884e87ee554d80498145 /ui-ssdiff.c | |
| parent | 207cc34711039329b41345f716bf421a88a6fd0a (diff) | |
| download | cgit-4a198e4b8ee62a9a8b5156a46bfce46dc7223fe9.zip cgit-4a198e4b8ee62a9a8b5156a46bfce46dc7223fe9.tar.gz cgit-4a198e4b8ee62a9a8b5156a46bfce46dc7223fe9.tar.bz2 | |
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>
| -rw-r--r-- | ui-ssdiff.c | 8 |
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 @@ -110,2 +110,4 @@ static void print_ssdiff_line(char *class, int old_line_no, char *old_line, old_line_no, class); + else if (old_line) + htmlf("<td class='lineno'></td><td class='%s'>", class); else @@ -124,2 +126,4 @@ static void print_ssdiff_line(char *class, int old_line_no, char *old_line, new_line_no, class); + else if (new_line) + htmlf("<td class='lineno'></td><td class='%s'>", class); else @@ -253,4 +257,4 @@ 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>"); |