author | Lars Hjemli <hjemli@gmail.com> | 2007-05-08 20:40:59 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-08 21:38:49 (UTC) |
commit | 61c3ca978c586c673aec618cb94210657278dda8 (patch) (unidiff) | |
tree | 7011987769e65ad0e7aa8b79f648357e9cd88c30 /ui-diff.c | |
parent | 66cacd053ba900c8eb3b7962027370c84a97f990 (diff) | |
download | cgit-61c3ca978c586c673aec618cb94210657278dda8.zip cgit-61c3ca978c586c673aec618cb94210657278dda8.tar.gz cgit-61c3ca978c586c673aec618cb94210657278dda8.tar.bz2 |
Update to libgit 1.5.2-rc2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-diff.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -4,13 +4,12 @@ | |||
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "xdiff.h" | ||
11 | 10 | ||
12 | char *diff_buffer; | 11 | char *diff_buffer; |
13 | int diff_buffer_size; | 12 | int diff_buffer_size; |
14 | 13 | ||
15 | 14 | ||
16 | /* | 15 | /* |
@@ -79,19 +78,19 @@ int diff_cb(void *priv_, mmbuffer_t *mb, int nbuf) | |||
79 | } | 78 | } |
80 | return 0; | 79 | return 0; |
81 | } | 80 | } |
82 | 81 | ||
83 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) | 82 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
84 | { | 83 | { |
85 | char type[20]; | 84 | enum object_type type; |
86 | 85 | ||
87 | if (is_null_sha1(sha1)) { | 86 | if (is_null_sha1(sha1)) { |
88 | file->ptr = (char *)""; | 87 | file->ptr = (char *)""; |
89 | file->size = 0; | 88 | file->size = 0; |
90 | } else { | 89 | } else { |
91 | file->ptr = read_sha1_file(sha1, type, &file->size); | 90 | file->ptr = read_sha1_file(sha1, &type, &file->size); |
92 | } | 91 | } |
93 | return 1; | 92 | return 1; |
94 | } | 93 | } |
95 | 94 | ||
96 | static void run_diff(const unsigned char *sha1, const unsigned char *sha2) | 95 | static void run_diff(const unsigned char *sha1, const unsigned char *sha2) |
97 | { | 96 | { |