Merge branch 'nd/remove-ignore-env-field'

diff --git a/cache.h b/cache.h
index 83ba2d2b03d7fbe6b0a30822177ac2fad11e96b4..6e45c1b5377cfca2e0621d529f69daac304e3f12 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -459,7 +459,7 @@ static inline enum object_type object_type(unsigned int mode)
  */
 extern const char * const local_repo_env[];
 
-extern void setup_git_env(void);
+extern void setup_git_env(const char *git_dir);
 
 /*
  * Returns true iff we have a configured git repository (either via