[PATCH 29/43] init/clone: turn on startup->have_repository properly
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Apr 5, 2010, 18:41 UTC
- Message-ID
- <1270492888-26589-30-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1270492888-26589-1-git-send-email-pclouds@gmail.com>
With startup_info != NULL, many code path may be disabled, depending on repo setup. Also move set_git_dir() closer to have_repository assignment to make it clear about repo setup.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/clone.c | 3 +-- builtin/init-db.c | 9 +++++---- cache.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c index 05f8fb4..3badb44 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -459,9 +459,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (safe_create_leading_directories_const(git_dir) < 0) die("could not create leading directories of '%s'", git_dir); - set_git_dir(make_absolute_path(git_dir)); - init_db(option_template, (option_verbosity < 0) ? INIT_DB_QUIET : 0); + init_db(git_dir, option_template, (option_verbosity < 0) ? INIT_DB_QUIET : 0); /* * At this point, the config exists, so we do not need the diff --git a/builtin/init-db.c b/builtin/init-db.c index edc40ff..064b919 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -294,12 +294,15 @@ static int create_default_files(const char *template_path) return reinit; } -int init_db(const char *template_dir, unsigned int flags) +int init_db(const char *git_dir, const char *template_dir, unsigned int flags) { const char *sha1_dir; char *path; int len, reinit; + set_git_dir(make_absolute_path(git_dir)); + startup_info->have_repository = 1; + safe_create_dir(get_git_dir(), 0); init_is_bare_repository = is_bare_repository(); @@ -509,7 +512,5 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) get_git_work_tree()); } - set_git_dir(make_absolute_path(git_dir)); - - return init_db(template_dir, flags); + return init_db(git_dir, template_dir, flags); } diff --git a/cache.h b/cache.h index f53fb32..2980741 100644 --- a/cache.h +++ b/cache.h @@ -430,7 +430,7 @@ extern void verify_non_filename(const char *prefix, const char *name); #define INIT_DB_QUIET 0x0001 -extern int init_db(const char *template_dir, unsigned int flags); +extern int init_db(const char *git_dir, const char *template_dir, unsigned int flags); #define alloc_nr(x) (((x)+16)*3/2)
-- 1.7.0.rc1.541.g2da82.dirty