undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init: call set_git_dir_init() from within init_db()

Browse Source 
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>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2016-09-25 10:14:37 +07:00 committed by Junio C Hamano
parent fe9aa0b22e
commit 33158701e2
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/clone.c
View File

@ -928,23 +928,22 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
set_git_work_tree(work_tree); 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) if (safe_create_leading_directories_const(git_dir) < 0)
die(_("could not create leading directories of '%s'"), git_dir); 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 (0 <= option_verbosity) {
if (option_bare) if (option_bare)
fprintf(stderr, _("Cloning into bare repository '%s'...\n"), dir); fprintf(stderr, _("Cloning into bare repository '%s'...\n"), dir);
else else
fprintf(stderr, _("Cloning into '%s'...\n"), dir); 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); write_config(&option_config);
git_config(git_default_config, NULL); git_config(git_default_config, NULL);

18
builtin/init-db.c
View File

@ -311,8 +311,9 @@ static void create_object_directory(void)
strbuf_release(&path); strbuf_release(&path);
} }
int set_git_dir_init(const char *git_dir, const char *real_git_dir, static int set_git_dir_init(const char *git_dir,
int exist_ok) const char *real_git_dir,
int exist_ok)
{ {
if (real_git_dir) { if (real_git_dir) {
struct stat st; struct stat st;
@ -359,10 +360,14 @@ static void separate_git_dir(const char *git_dir)
write_file(git_link, "gitdir: %s", 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; 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) if (git_link)
separate_git_dir(git_dir); 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_work_tree(work_tree);
} }
set_git_dir_init(git_dir, real_git_dir, 1); flags |= INIT_DB_EXIST_OK;
return init_db(git_dir, real_git_dir, template_dir, flags);
return init_db(template_dir, flags);
} }

5
cache.h
View File

@ -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); extern int path_inside_repo(const char *prefix, const char *path);
#define INIT_DB_QUIET 0x0001 #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 *git_dir, const char *real_git_dir,
extern int init_db(const char *template_dir, unsigned int flags); const char *template_dir, unsigned int flags);
extern void sanitize_stdfds(void); extern void sanitize_stdfds(void);
extern int daemonize(void); extern int daemonize(void);