Unidiff1 files changed, 2 insertions, 1 deletions
|
diff --git a/shared.c b/shared.c index 1cd60a2..343a4f9 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -305,13 +305,14 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
305 | enum object_type type; |
305 | enum object_type type; |
306 | |
306 | |
307 | if (is_null_sha1(sha1)) { |
307 | if (is_null_sha1(sha1)) { |
308 | file->ptr = (char *)""; |
308 | file->ptr = (char *)""; |
309 | file->size = 0; |
309 | file->size = 0; |
310 | } else { |
310 | } else { |
311 | file->ptr = read_sha1_file(sha1, &type, &file->size); |
311 | file->ptr = read_sha1_file(sha1, &type, |
| |
312 | (unsigned long *)&file->size); |
312 | } |
313 | } |
313 | return 1; |
314 | return 1; |
314 | } |
315 | } |
315 | |
316 | |
316 | /* |
317 | /* |
317 | * Receive diff-buffers from xdiff and concatenate them as |
318 | * Receive diff-buffers from xdiff and concatenate them as |
|