Merge branch 'ss/svnimport'

diff --git a/diffcore-delta.c b/diffcore-delta.c
index a038b166c5aa095ffdf31c2fb0e3263ed13cf8b1..d9729e5ec27d2ff2bacf4ed930195f9293f8ca5a 100644 (file)
--- a/diffcore-delta.c
+++ b/diffcore-delta.c
@@ -129,7 +129,7 @@ static struct spanhash_top *hash_chars(struct diff_filespec *one)
        struct spanhash_top *hash;
        unsigned char *buf = one->data;
        unsigned int sz = one->size;
-       int is_text = !one->is_binary;
+       int is_text = !diff_filespec_is_binary(one);
 
        i = INITIAL_HASH_SIZE;
        hash = xmalloc(sizeof(*hash) + sizeof(struct spanhash) * (1<<i));