|
diff --git a/ui-diff.c b/ui-diff.c index b21c2c1..a92a768 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -254,9 +254,9 @@ static void print_ssdiff_link() |
254 | if (use_ssdiff) |
254 | if (use_ssdiff) |
255 | cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, |
255 | cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, |
256 | ctx.qry.sha1, ctx.qry.sha2, NULL, 1); |
256 | ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1); |
257 | else |
257 | else |
258 | cgit_diff_link("Side-by-side diff", NULL, NULL, |
258 | cgit_diff_link("Side-by-side diff", NULL, NULL, |
259 | ctx.qry.head, ctx.qry.sha1, |
259 | ctx.qry.head, ctx.qry.sha1, |
260 | ctx.qry.sha2, NULL, 1); |
260 | ctx.qry.sha2, ctx.qry.path, 1); |
261 | } |
261 | } |
262 | } |
262 | } |
@@ -282,4 +282,6 @@ static void filepair_cb(struct diff_filepair *pair) |
282 | if (S_ISGITLINK(pair->two->mode)) |
282 | if (S_ISGITLINK(pair->two->mode)) |
283 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
283 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
| |
284 | if (use_ssdiff) |
| |
285 | cgit_ssdiff_footer(); |
284 | return; |
286 | return; |
285 | } |
287 | } |
@@ -287,6 +289,10 @@ static void filepair_cb(struct diff_filepair *pair) |
287 | &new_size, &binary, print_line_fn)) |
289 | &new_size, &binary, print_line_fn)) |
288 | cgit_print_error("Error running diff"); |
290 | cgit_print_error("Error running diff"); |
289 | if (binary) |
291 | if (binary) { |
290 | print_line_fn(" Binary files differ", 20); |
292 | if (use_ssdiff) |
| |
293 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
| |
294 | else |
| |
295 | html("Binary files differ"); |
| |
296 | } |
291 | if (use_ssdiff) |
297 | if (use_ssdiff) |
292 | cgit_ssdiff_footer(); |
298 | cgit_ssdiff_footer(); |
|