author | Lars Hjemli <hjemli@gmail.com> | 2009-02-01 18:29:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-02-01 18:29:47 (UTC) |
commit | 5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6 (patch) (unidiff) | |
tree | 823678b1c4a907cf0df50067c27fb5b752114df5 /ui-patch.c | |
parent | 0b3c746ba80738dbe0885a21406409390936537c (diff) | |
parent | 481ce5e298e2dcd7edc1d4a30e523dda2ce58b01 (diff) | |
download | cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.zip cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.gz cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.bz2 |
Merge branch 'lh/binary'
-rw-r--r-- | ui-patch.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -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 | } |