Merge branch 'master' into pb/gitpm

diff --git a/cache.h b/cache.h
index af7740258d8d1bf5e44d2233c1fe1c35aa62ec77..2b8fafbd637fb6c7510c198ac4257c08d290311d 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -117,6 +117,9 @@ extern unsigned int active_nr, active_alloc, active_cache_changed;
 extern struct cache_tree *active_cache_tree;
 extern int cache_errno;
 
+extern void setup_git(char *new_git_dir, char *new_git_object_dir,
+                      char *new_git_index_file, char *new_git_graft_file);
+
 #define GIT_DIR_ENVIRONMENT "GIT_DIR"
 #define DEFAULT_GIT_DIR_ENVIRONMENT ".git"
 #define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY"