Merge branch 'jk/remote-pushremote-config-reading' into maint

diff --git a/diffcore.h b/diffcore.h
index d911bf0a42eeef68023459d6b03a8d1cafa74683..1315cfd4ef0fbe0aeb0cae9a14bf09fd53212124 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -46,7 +46,7 @@ struct diff_filespec {
        unsigned is_stdin : 1;
        unsigned has_more_entries : 1; /* only appear in combined diff */
        /* data should be considered "binary"; -1 means "don't know yet" */
-       int is_binary;
+       int is_binary : 2;
        struct userdiff_driver *driver;
 };
 
@@ -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)