mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setup.c: support multi-checkout repo setup

Browse Source 
The repo setup procedure is updated to detect $GIT_DIR/commondir and
set $GIT_COMMON_DIR properly.

The core.worktree is ignored when $GIT_COMMON_DIR is set. This is
because the config file is shared in multi-checkout setup, but
checkout directories _are_ different. Making core.worktree effective
in all checkouts mean it's back to a single checkout.

Helped-by: Johannes Sixt <j6t@kdbg.org>
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
2014-11-30 15:24:44 +07:00
committed by Junio C Hamano
parent e61a509a49
commit 31e26ebcb5
9 changed files with 115 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
environment.c
View File

@ -142,6 +142,7 @@ static char *git_path_from_env(const char *envvar, const char *git_dir,
static void setup_git_env(void)
{
struct strbuf sb = STRBUF_INIT;
const char *gitfile;
const char *shallow_file;
@ -150,12 +151,9 @@ static void setup_git_env(void)
git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
gitfile = read_gitfile(git_dir);
git_dir = xstrdup(gitfile ? gitfile : git_dir);
git_common_dir = getenv(GIT_COMMON_DIR_ENVIRONMENT);
if (git_common_dir) {
if (get_common_dir(&sb, git_dir))
git_common_dir_env = 1;
git_common_dir = xstrdup(git_common_dir);
} else
git_common_dir = git_dir;
git_common_dir = strbuf_detach(&sb, NULL);
git_object_dir = git_path_from_env(DB_ENVIRONMENT, git_common_dir,
"objects", &git_db_env);
git_index_file = git_path_from_env(INDEX_ENVIRONMENT, git_dir,