diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-09-25 03:14:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-25 23:32:35 (GMT) |
| commit | 33158701e2cac4244a236cd18d9d336f66e535f3 (patch) | |
| tree | fbb5ae9663797e8c3b74afc59801d65e053753f6 /builtin/init-db.c | |
| parent | fe9aa0b22e18e5cd1ae4a9323edad0d3c8177c90 (diff) | |
| download | git-33158701e2cac4244a236cd18d9d336f66e535f3.zip git-33158701e2cac4244a236cd18d9d336f66e535f3.tar.gz git-33158701e2cac4244a236cd18d9d336f66e535f3.tar.bz2 | |
init: call set_git_dir_init() from within init_db()
The next commit requires that set_git_dir_init() must be called before
init_db(). Let's make sure nobody can do otherwise.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/init-db.c')
| -rw-r--r-- | builtin/init-db.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/builtin/init-db.c b/builtin/init-db.c index d5d7558..5cb05d9 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -311,8 +311,9 @@ static void create_object_directory(void) strbuf_release(&path); } -int set_git_dir_init(const char *git_dir, const char *real_git_dir, - int exist_ok) +static int set_git_dir_init(const char *git_dir, + const char *real_git_dir, + int exist_ok) { if (real_git_dir) { struct stat st; @@ -359,10 +360,14 @@ static void separate_git_dir(const char *git_dir) write_file(git_link, "gitdir: %s", git_dir); } -int init_db(const char *template_dir, unsigned int flags) +int init_db(const char *git_dir, const char *real_git_dir, + const char *template_dir, unsigned int flags) { int reinit; - const char *git_dir = get_git_dir(); + + set_git_dir_init(git_dir, real_git_dir, flags & INIT_DB_EXIST_OK); + + git_dir = get_git_dir(); if (git_link) separate_git_dir(git_dir); @@ -582,7 +587,6 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) set_git_work_tree(work_tree); } - set_git_dir_init(git_dir, real_git_dir, 1); - - return init_db(template_dir, flags); + flags |= INIT_DB_EXIST_OK; + return init_db(git_dir, real_git_dir, template_dir, flags); } |