summaryrefslogtreecommitdiffabout
path: root/ui-patch.c
authorLars Hjemli <hjemli@gmail.com>2009-01-31 09:40:40 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-01-31 09:40:40 (UTC)
commitc495cf02bac16e459f7c9e1740798646f12c00c5 (patch) (unidiff)
treea36ba3904edd96ffc79fdf420fb10d33117a469f /ui-patch.c
parentd6174b7aab476c2b6a86e59d98cf978d603045f4 (diff)
downloadcgit-c495cf02bac16e459f7c9e1740798646f12c00c5.zip
cgit-c495cf02bac16e459f7c9e1740798646f12c00c5.tar.gz
cgit-c495cf02bac16e459f7c9e1740798646f12c00c5.tar.bz2
Handle binary files in diffs
This teaches all diff-related operations (i.e. ui-log, ui-diff and ui-patch) how to handle binary files. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-patch.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-patch.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/ui-patch.c b/ui-patch.c
index 1d77336..5d665d3 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -59,2 +59,6 @@ static void filepair_cb(struct diff_filepair *pair)
59{ 59{
60 unsigned long old_size = 0;
61 unsigned long new_size = 0;
62 int binary = 0;
63
60 header(pair->one->sha1, pair->one->path, pair->one->mode, 64 header(pair->one->sha1, pair->one->path, pair->one->mode,
@@ -68,4 +72,7 @@ static void filepair_cb(struct diff_filepair *pair)
68 } 72 }
69 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) 73 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
74 &new_size, &binary, print_line))
70 html("Error running diff"); 75 html("Error running diff");
76 if (binary)
77 html("Binary files differ\n");
71} 78}