Merge branch 'md/smtp-tls-hello-again'

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index e39e1600189a6daae0eb29e165b08949f66bae9f..be07ec70863cae3f6e1c9d5dbc6dc555e444e30a 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -168,6 +168,7 @@ struct cache_entry {
        unsigned int ce_flags;
        unsigned char sha1[20];
        struct cache_entry *next;
+       struct cache_entry *dir_next;
        char name[FLEX_ARRAY]; /* more */
 };
 
@@ -589,6 +590,7 @@ extern int warn_ambiguous_refs;
 extern int shared_repository;
 extern const char *apply_default_whitespace;
 extern const char *apply_default_ignorewhitespace;
+extern const char *git_attributes_file;
 extern int zlib_compression_level;
 extern int core_compression_level;
 extern int core_compression_seen;