summaryrefslogtreecommitdiff
path: root/ui-diff.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-05-08 22:40:59 +0200
committerLars Hjemli <hjemli@gmail.com>2007-05-08 23:38:49 +0200
commit61c3ca978c586c673aec618cb94210657278dda8 (patch)
tree7011987769e65ad0e7aa8b79f648357e9cd88c30 /ui-diff.c
parent66cacd053ba900c8eb3b7962027370c84a97f990 (diff)
downloadcgit-61c3ca978c586c673aec618cb94210657278dda8.tar.gz
cgit-61c3ca978c586c673aec618cb94210657278dda8.tar.bz2
cgit-61c3ca978c586c673aec618cb94210657278dda8.zip
Update to libgit 1.5.2-rc2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-diff.c')
-rw-r--r--ui-diff.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ui-diff.c b/ui-diff.c
index b6486f1..0ad9faf 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -7,7 +7,6 @@
*/
#include "cgit.h"
-#include "xdiff.h"
char *diff_buffer;
int diff_buffer_size;
@@ -82,13 +81,13 @@ int diff_cb(void *priv_, mmbuffer_t *mb, int nbuf)
static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
{
- char type[20];
+ enum object_type type;
if (is_null_sha1(sha1)) {
file->ptr = (char *)"";
file->size = 0;
} else {
- file->ptr = read_sha1_file(sha1, type, &file->size);
+ file->ptr = read_sha1_file(sha1, &type, &file->size);
}
return 1;
}