Merge branch 'nd/init-core-worktree-in-multi-worktree-world'

[thirdparty/git.git] / cache.h

diff --git a/cache.h b/cache.h
index ed3d5dfce1b9eb2d6273edac45901632304d4be2..6fc0e5ae68a6965c8be3b822400145095b56f755 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -526,9 +526,10 @@ extern void verify_non_filename(const char *prefix, const char *name);
 extern int path_inside_repo(const char *prefix, const char *path);
 
 #define INIT_DB_QUIET 0x0001
+#define INIT_DB_EXIST_OK 0x0002
 
-extern int set_git_dir_init(const char *git_dir, const char *real_git_dir, int);
-extern int init_db(const char *template_dir, unsigned int flags);
+extern int init_db(const char *git_dir, const char *real_git_dir,
+                  const char *template_dir, unsigned int flags);
 
 extern void sanitize_stdfds(void);
 extern int daemonize(void);