Merge branch 'tg/split-index-fixes' into maint

[git/git.git] / cache.h

diff --git a/cache.h b/cache.h
index d8b975a..fd755c3 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -345,7 +345,8 @@ struct index_state {
        struct split_index *split_index;
        struct cache_time timestamp;
        unsigned name_hash_initialized : 1,
        struct split_index *split_index;
        struct cache_time timestamp;
        unsigned name_hash_initialized : 1,

-                initialized : 1;
+                initialized : 1,
+                drop_cache_tree : 1;

        struct hashmap name_hash;
        struct hashmap dir_hash;
        unsigned char sha1[20];
        struct hashmap name_hash;
        struct hashmap dir_hash;
        unsigned char sha1[20];


@@ -371,7 +372,7 @@ extern void free_name_hash(struct index_state *istate);
 #define active_cache_tree (the_index.cache_tree)
 
 #define read_cache() read_index(&the_index)
 #define active_cache_tree (the_index.cache_tree)
 
 #define read_cache() read_index(&the_index)

-#define read_cache_from(path) read_index_from(&the_index, (path))
+#define read_cache_from(path) read_index_from(&the_index, (path), (get_git_dir()))

 #define read_cache_preload(pathspec) read_index_preload(&the_index, (pathspec))
 #define is_cache_unborn() is_index_unborn(&the_index)
 #define read_cache_unmerged() read_index_unmerged(&the_index)
 #define read_cache_preload(pathspec) read_index_preload(&the_index, (pathspec))
 #define is_cache_unborn() is_index_unborn(&the_index)
 #define read_cache_unmerged() read_index_unmerged(&the_index)


@@ -616,7 +617,8 @@ extern int read_index(struct index_state *);
 extern int read_index_preload(struct index_state *, const struct pathspec *pathspec);
 extern int do_read_index(struct index_state *istate, const char *path,
                         int must_exist); /* for testting only! */
 extern int read_index_preload(struct index_state *, const struct pathspec *pathspec);
 extern int do_read_index(struct index_state *istate, const char *path,
                         int must_exist); /* for testting only! */

-extern int read_index_from(struct index_state *, const char *path);
+extern int read_index_from(struct index_state *, const char *path,
+                          const char *gitdir);

 extern int is_index_unborn(struct index_state *);
 extern int read_index_unmerged(struct index_state *);
 
 extern int is_index_unborn(struct index_state *);
 extern int read_index_unmerged(struct index_state *);