tree-diff: allow diff_tree_sha1 to accept NULL sha1

diff --git a/diffcore.h b/diffcore.h
index 22993e1effc8a557f9b169abbe15fbed26e0fbb4..79de8cf28dc6919f069ae44f7f036a46264452e9 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -45,9 +45,9 @@ struct diff_filespec {
 #define DIRTY_SUBMODULE_MODIFIED  2
        unsigned is_stdin : 1;
        unsigned has_more_entries : 1; /* only appear in combined diff */
-       struct userdiff_driver *driver;
        /* data should be considered "binary"; -1 means "don't know yet" */
-       int is_binary;
+       int is_binary : 2;
+       struct userdiff_driver *driver;
 };
 
 extern struct diff_filespec *alloc_filespec(const char *);