kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

init: kill set_git_dir_init() 

This is a pure code move, necessary to kill the global variable git_link
later (and also helps a bit in the next patch).

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2016-09-25 10:14:38 +07:00 committed by Junio C Hamano
parent 33158701e2
commit 1bd1907951
1 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
builtin/init-db.c
View File

@ -311,34 +311,6 @@ static void create_object_directory(void)
strbuf_release(&path); strbuf_release(&path);
} }


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;

if (!exist_ok && !stat(git_dir, &st))
die(_("%s already exists"), git_dir);

if (!exist_ok && !stat(real_git_dir, &st))
die(_("%s already exists"), real_git_dir);

/*
* make sure symlinks are resolved because we'll be
* moving the target repo later on in separate_git_dir()
*/
git_link = xstrdup(real_path(git_dir));
set_git_dir(real_path(real_git_dir));
}
else {
set_git_dir(real_path(git_dir));
git_link = NULL;
}
startup_info->have_repository = 1;
return 0;
}

static void separate_git_dir(const char *git_dir) static void separate_git_dir(const char *git_dir)
{ {
struct stat st; struct stat st;
@ -364,9 +336,29 @@ int init_db(const char *git_dir, const char *real_git_dir,
const char *template_dir, unsigned int flags) const char *template_dir, unsigned int flags)
{ {
int reinit; int reinit;
int exist_ok = flags & INIT_DB_EXIST_OK;


set_git_dir_init(git_dir, real_git_dir, flags & INIT_DB_EXIST_OK); if (real_git_dir) {
struct stat st;


if (!exist_ok && !stat(git_dir, &st))
die(_("%s already exists"), git_dir);

if (!exist_ok && !stat(real_git_dir, &st))
die(_("%s already exists"), real_git_dir);

/*
* make sure symlinks are resolved because we'll be
* moving the target repo later on in separate_git_dir()
*/
git_link = xstrdup(real_path(git_dir));
set_git_dir(real_path(real_git_dir));
}
else {
set_git_dir(real_path(git_dir));
git_link = NULL;
}
startup_info->have_repository = 1;
git_dir = get_git_dir(); git_dir = get_git_dir();


if (git_link) if (git_link)