aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-03 13:30:34 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-03 13:30:35 -0700
commit53eb85e6230e2c09dbc06f88b67e7a3baccc4446 (patch)
tree6290667f96d15d82b964e5f9ed9db906e8fca616 /cache.h
parent347408496a08f18b49b3646b6bb20d17cce85632 (diff)
parent822d9406c0b397bac7cfc4fda7b355aa1dd2cc52 (diff)
downloadgit-53eb85e6230e2c09dbc06f88b67e7a3baccc4446.tar.gz
git-53eb85e6230e2c09dbc06f88b67e7a3baccc4446.tar.xz
Merge branch 'nd/init-core-worktree-in-multi-worktree-world'
"git init" tried to record core.worktree in the repository's 'config' file when GIT_WORK_TREE environment variable was set and it was different from where GIT_DIR appears as ".git" at its top, but the logic was faulty when .git is a "gitdir:" file that points at the real place, causing trouble in working trees that are managed by "git worktree". This has been corrected. * nd/init-core-worktree-in-multi-worktree-world: init: kill git_link variable init: do not set unnecessary core.worktree init: kill set_git_dir_init() init: call set_git_dir_init() from within init_db() init: correct re-initialization from a linked worktree
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index ed3d5dfce..6fc0e5ae6 100644
--- 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);