[PATCH v2 4/3] init: combine set_git_dir_init() and init_db() into one
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Sep 23, 2016, 11:12 UTC
- Message-ID
- <20160923111206.8596-1-pclouds@gmail.com>
- In-Reply-To
- <xmqqbmzf6e0r.fsf@gitster.mtv.corp.google.com>
Commit "init: do not set core.worktree more often than necessary" adds a subtle dependency between set_git_dir_init() and init_db(). The former _must_ be called before init_db() so that original_git_dir can be set properly. If something else, like enter_repo() or setup_git_directory(), is used instead, the trick in that commit breaks down.
To eliminate the possibility that init_db() in future may be called without set_git_dir_init(), init_db() now calls that function internally (and does not allow anybody else to use it).
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- I think a separate commit for this is better than combining back to 2/3 so we can explain the problem properly (without making 2/3 commit message even longer)
Not sure if you want to s/contains/contain/ in 2/3 by yourself or I should resend the whole series. Let me know.
builtin/clone.c | 15 +++++++-------- builtin/init-db.c | 18 +++++++++++------- cache.h | 5 +++-- 3 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c index 6616392..29b1832 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -928,23 +928,22 @@ int cmd_clone(int argc, const char **argv, const char *prefix) set_git_work_tree(work_tree); } - junk_git_dir = git_dir; + junk_git_dir = real_git_dir ? real_git_dir : git_dir; if (safe_create_leading_directories_const(git_dir) < 0) die(_("could not create leading directories of '%s'"), git_dir); - set_git_dir_init(git_dir, real_git_dir, 0); - if (real_git_dir) { - git_dir = real_git_dir; - junk_git_dir = real_git_dir; - } - if (0 <= option_verbosity) { if (option_bare) fprintf(stderr, _("Cloning into bare repository '%s'...\n"), dir); else fprintf(stderr, _("Cloning into '%s'...\n"), dir); } - init_db(option_template, INIT_DB_QUIET); + + init_db(git_dir, real_git_dir, option_template, INIT_DB_QUIET); + + if (real_git_dir) + git_dir = real_git_dir; + write_config(&option_config); git_config(git_default_config, NULL); diff --git a/builtin/init-db.c b/builtin/init-db.c index d70fc45..ee7942f 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -312,8 +312,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) { original_git_dir = xstrdup(real_path(git_dir)); @@ -362,10 +363,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); @@ -585,7 +590,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); } diff --git a/cache.h b/cache.h index b2d77f3..7fc875f 100644 --- a/cache.h +++ b/cache.h @@ -525,9 +525,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);
-- 2.8.2.524.g6ff3d78