summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
Unidiff
Diffstat (limited to 'ui-diff.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 2196745..0c6f8d7 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -11,2 +11,3 @@
11#include "ui-shared.h" 11#include "ui-shared.h"
12#include "ui-ssdiff.h"
12 13
@@ -34,2 +35,3 @@ static struct fileinfo {
34 35
36static int use_ssdiff = 0;
35 37
@@ -246,2 +248,4 @@ static void header(unsigned char *sha1, char *path1, int mode1,
246 html("</div>"); 248 html("</div>");
249 if (use_ssdiff)
250 cgit_ssdiff_header();
247} 251}
@@ -253,2 +257,3 @@ static void filepair_cb(struct diff_filepair *pair)
253 int binary = 0; 257 int binary = 0;
258 linediff_fn print_line_fn = print_line;
254 259
@@ -256,2 +261,6 @@ static void filepair_cb(struct diff_filepair *pair)
256 pair->two->sha1, pair->two->path, pair->two->mode); 261 pair->two->sha1, pair->two->path, pair->two->mode);
262 if (use_ssdiff) {
263 cgit_ssdiff_header();
264 print_line_fn = cgit_ssdiff_line_cb;
265 }
257 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { 266 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
@@ -263,4 +272,4 @@ static void filepair_cb(struct diff_filepair *pair)
263 } 272 }
264 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 273 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
265 &new_size, &binary, print_line)) 274 &new_size, &binary, print_line_fn))
266 cgit_print_error("Error running diff"); 275 cgit_print_error("Error running diff");
@@ -268,2 +277,4 @@ static void filepair_cb(struct diff_filepair *pair)
268 html("Binary files differ"); 277 html("Binary files differ");
278 if (use_ssdiff)
279 cgit_ssdiff_footer();
269} 280}