Merge branch 'ma/header-dup-cleanup'

[thirdparty/git.git] / cache.h

diff --git a/cache.h b/cache.h
index cfba463aa97cb40ffebb4742c087f24daf791460..281f00ab1b161dc71d0bcdae91222e9429ba0342 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -350,8 +350,6 @@ void add_name_hash(struct index_state *istate, struct cache_entry *ce);
 void remove_name_hash(struct index_state *istate, struct cache_entry *ce);
 void free_name_hash(struct index_state *istate);
 
-void ensure_full_index(struct index_state *istate);
-
 /* Cache entry creation and cleanup */
 
 /*
@@ -1846,8 +1844,10 @@ void overlay_tree_on_index(struct index_state *istate,
 struct startup_info {
        int have_repository;
        const char *prefix;
+       const char *original_cwd;
 };
 extern struct startup_info *startup_info;
+extern const char *tmp_original_cwd;
 
 /* merge.c */
 struct commit_list;