log-tree: make add_name_decoration a public function

diff --git a/diffcore.h b/diffcore.h
index 22993e1effc8a557f9b169abbe15fbed26e0fbb4..1315cfd4ef0fbe0aeb0cae9a14bf09fd53212124 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 *);
@@ -68,6 +68,8 @@ struct diff_filepair {
        unsigned broken_pair : 1;
        unsigned renamed_pair : 1;
        unsigned is_unmerged : 1;
+       unsigned done_skip_stat_unmatch : 1;
+       unsigned skip_stat_unmatch_result : 1;
 };
 #define DIFF_PAIR_UNMERGED(p) ((p)->is_unmerged)