mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 02:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

setup: limit get_git_work_tree()'s to explicit setup case only

Browse Source 
get_git_work_tree() takes input as core.worktree, core.bare,
GIT_WORK_TREE and decides correct worktree setting.

Unfortunately it does not do its job well. core.worktree and
GIT_WORK_TREE should only be taken into account, if GIT_DIR is set
(which is handled by setup_explicit_git_dir). For other setup cases,
only core.bare matters.

Add a temporary variable setup_explicit to adjust get_git_work_tree()
behavior as such. This variable will be gone once setup_* rework is
done.

Also remove is_bare_repository_cfg check in set_git_work_tree() to
ease the rework. We are going to check for core.bare and core.worktree
early before setting worktree. For example, if core.bare is true, no
need to set worktree.

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 2010-11-26 22:32:35 +07:00 committed by Junio C Hamano
parent 337e51cedf
commit e6aea2dba2
5 changed files with 51 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/init-db.c
View File

@ -496,6 +496,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
if (is_bare_repository_cfg < 0)
is_bare_repository_cfg = guess_repository_type(git_dir);
startup_info->setup_explicit = 1;
if (!is_bare_repository_cfg) {
if (git_dir) {
const char *git_dir_parent = strrchr(git_dir, '/');

1
cache.h
View File

@ -1119,6 +1119,7 @@ const char *split_cmdline_strerror(int cmdline_errno);
/* git.c */
struct startup_info {
int have_repository;
int setup_explicit;
};
extern struct startup_info *startup_info;

10
environment.c
View File

@ -137,8 +137,6 @@ static int git_work_tree_initialized;
*/
void set_git_work_tree(const char *new_work_tree)
{
if (is_bare_repository_cfg >= 0)
die("cannot set work tree after initialization");
git_work_tree_initialized = 1;
free(work_tree);
work_tree = xstrdup(make_absolute_path(new_work_tree));
@ -147,6 +145,14 @@ void set_git_work_tree(const char *new_work_tree)
const char *get_git_work_tree(void)
{
if (startup_info && !startup_info->setup_explicit) {
if (is_bare_repository_cfg == 1)
return NULL;
if (work_tree)
is_bare_repository_cfg = 0;
return work_tree;
}
if (!git_work_tree_initialized) {
work_tree = getenv(GIT_WORK_TREE_ENVIRONMENT);
/* core.bare = true overrides implicit and config work tree */

10
setup.c
View File

@ -331,6 +331,8 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
static char buffer[1024 + 1];
const char *retval;
if (startup_info)
startup_info->setup_explicit = 1;
if (PATH_MAX - 40 < strlen(gitdirenv))
die("'$%s' too big", GIT_DIR_ENVIRONMENT);
if (!is_git_directory(gitdirenv)) {
@ -382,12 +384,15 @@ static const char *setup_discovered_git_dir(const char *work_tree_env,
char *cwd, int *nongit_ok)
{
int root_len;
char *work_tree;
inside_git_dir = 0;
if (!work_tree_env)
inside_work_tree = 1;
root_len = offset_1st_component(cwd);
git_work_tree_cfg = xstrndup(cwd, offset > root_len ? offset : root_len);
work_tree = xstrndup(cwd, offset > root_len ? offset : root_len);
set_git_work_tree(work_tree);
free(work_tree);
if (check_repository_format_gently(gitdir, nongit_ok))
return NULL;
if (offset == len)
@ -627,7 +632,8 @@ const char *setup_git_directory(void)
const char *retval = setup_git_directory_gently(NULL);
/* If the work tree is not the default one, recompute prefix */
if (inside_work_tree < 0) {
if ((!startup_info || startup_info->setup_explicit) &&
inside_work_tree < 0) {
static char buffer[PATH_MAX + 1];
char *rel;
if (retval && chdir(retval))

66
t/t1510-repo-setup.sh
View File

@ -132,7 +132,7 @@ test_expect_success '#1: setup' '
cd ..
'
test_expect_failure '#1: at root' '
test_expect_success '#1: at root' '
cat >1/expected <<EOF &&
setup: git_dir: .git
setup: worktree: $TRASH_DIRECTORY/1
@ -142,7 +142,7 @@ EOF
test_repo 1
'
test_expect_failure '#1: in subdir' '
test_expect_success '#1: in subdir' '
cat >1/sub/expected <<EOF &&
setup: git_dir: .git
setup: worktree: $TRASH_DIRECTORY/1
@ -512,7 +512,7 @@ test_expect_success '#4: setup' '
cd ..
'
test_expect_failure '#4: at root' '
test_expect_success '#4: at root' '
cat >4/expected <<EOF &&
setup: git_dir: .git
setup: worktree: $TRASH_DIRECTORY/4
@ -522,7 +522,7 @@ EOF
test_repo 4
'
test_expect_failure '#4: in subdir' '
test_expect_success '#4: in subdir' '
cat >4/sub/expected <<EOF &&
setup: git_dir: .git
setup: worktree: $TRASH_DIRECTORY/4
@ -560,7 +560,7 @@ test_expect_success '#5: setup' '
cd ..
'
test_expect_failure '#5: at root' '
test_expect_success '#5: at root' '
cat >5/expected <<EOF &&
setup: git_dir: .git
setup: worktree: $TRASH_DIRECTORY/5
@ -570,7 +570,7 @@ EOF
test_repo 5
'
test_expect_failure '#5: in subdir' '
test_expect_success '#5: in subdir' '
cat >5/sub/expected <<EOF &&
setup: git_dir: .git
setup: worktree: $TRASH_DIRECTORY/5
@ -1213,7 +1213,7 @@ test_expect_success '#9: setup' '
cd ..
'
test_expect_failure '#9: at root' '
test_expect_success '#9: at root' '
cat >9/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/9.git
setup: worktree: $TRASH_DIRECTORY/9
@ -1223,7 +1223,7 @@ EOF
test_repo 9
'
test_expect_failure '#9: in subdir' '
test_expect_success '#9: in subdir' '
cat >9/sub/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/9.git
setup: worktree: $TRASH_DIRECTORY/9
@ -1596,7 +1596,7 @@ test_expect_success '#12: setup' '
cd ..
'
test_expect_failure '#12: at root' '
test_expect_success '#12: at root' '
cat >12/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/12.git
setup: worktree: $TRASH_DIRECTORY/12
@ -1606,7 +1606,7 @@ EOF
test_repo 12
'
test_expect_failure '#12: in subdir' '
test_expect_success '#12: in subdir' '
cat >12/sub/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/12.git
setup: worktree: $TRASH_DIRECTORY/12
@ -1646,7 +1646,7 @@ test_expect_success '#13: setup' '
cd ..
'
test_expect_failure '#13: at root' '
test_expect_success '#13: at root' '
cat >13/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/13.git
setup: worktree: $TRASH_DIRECTORY/13
@ -1656,7 +1656,7 @@ EOF
test_repo 13
'
test_expect_failure '#13: in subdir' '
test_expect_success '#13: in subdir' '
cat >13/sub/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/13.git
setup: worktree: $TRASH_DIRECTORY/13
@ -2388,7 +2388,7 @@ test_expect_success '#17.1: setup' '
cd ..
'
test_expect_failure '#17.1: at .git' '
test_expect_success '#17.1: at .git' '
cat >17/.git/expected <<EOF &&
setup: git_dir: .
setup: worktree: (null)
@ -2398,7 +2398,7 @@ EOF
test_repo 17/.git
'
test_expect_failure '#17.1: in .git/wt' '
test_expect_success '#17.1: in .git/wt' '
cat >17/.git/wt/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/17/.git
setup: worktree: (null)
@ -2408,7 +2408,7 @@ EOF
test_repo 17/.git/wt
'
test_expect_failure '#17.1: in .git/wt/sub' '
test_expect_success '#17.1: in .git/wt/sub' '
cat >17/.git/wt/sub/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/17/.git
setup: worktree: (null)
@ -2439,7 +2439,7 @@ test_expect_success '#17.2: setup' '
git config --file="$TRASH_DIRECTORY/17/.git/config" core.bare true
'
test_expect_failure '#17.2: at .git' '
test_expect_success '#17.2: at .git' '
cat >17/.git/expected <<EOF &&
setup: git_dir: .
setup: worktree: (null)
@ -2449,7 +2449,7 @@ EOF
test_repo 17/.git
'
test_expect_failure '#17.2: in .git/wt' '
test_expect_success '#17.2: in .git/wt' '
cat >17/.git/wt/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/17/.git
setup: worktree: (null)
@ -2459,7 +2459,7 @@ EOF
test_repo 17/.git/wt
'
test_expect_failure '#17.2: in .git/wt/sub' '
test_expect_success '#17.2: in .git/wt/sub' '
cat >17/.git/wt/sub/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/17/.git
setup: worktree: (null)
@ -2469,7 +2469,7 @@ EOF
test_repo 17/.git/wt/sub
'
test_expect_failure '#17.2: at root' '
test_expect_success '#17.2: at root' '
cat >17/expected <<EOF &&
setup: git_dir: .git
setup: worktree: (null)
@ -2853,7 +2853,7 @@ test_expect_success '#20.1: setup' '
cd ..
'
test_expect_failure '#20.1: at .git' '
test_expect_success '#20.1: at .git' '
cat >20/.git/expected <<EOF &&
setup: git_dir: .
setup: worktree: (null)
@ -2863,7 +2863,7 @@ EOF
test_repo 20/.git
'
test_expect_failure '#20.1: in .git/wt' '
test_expect_success '#20.1: in .git/wt' '
cat >20/.git/wt/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/20/.git
setup: worktree: (null)
@ -2873,7 +2873,7 @@ EOF
test_repo 20/.git/wt
'
test_expect_failure '#20.1: in .git/wt/sub' '
test_expect_success '#20.1: in .git/wt/sub' '
cat >20/.git/wt/sub/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/20/.git
setup: worktree: (null)
@ -2983,7 +2983,7 @@ test_expect_success '#21.1: setup' '
cd ..
'
test_expect_failure '#21.1: at .git' '
test_expect_success '#21.1: at .git' '
cat >21/.git/expected <<EOF &&
setup: git_dir: .
setup: worktree: (null)
@ -2993,7 +2993,7 @@ EOF
test_repo 21/.git
'
test_expect_failure '#21.1: in .git/wt' '
test_expect_success '#21.1: in .git/wt' '
cat >21/.git/wt/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/21/.git
setup: worktree: (null)
@ -3003,7 +3003,7 @@ EOF
test_repo 21/.git/wt
'
test_expect_failure '#21.1: in .git/wt/sub' '
test_expect_success '#21.1: in .git/wt/sub' '
cat >21/.git/wt/sub/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/21/.git
setup: worktree: (null)
@ -3034,7 +3034,7 @@ test_expect_success '#21.2: setup' '
git config --file="$TRASH_DIRECTORY/21/.git/config" core.bare true
'
test_expect_failure '#21.2: at .git' '
test_expect_success '#21.2: at .git' '
cat >21/.git/expected <<EOF &&
setup: git_dir: .
setup: worktree: (null)
@ -3044,7 +3044,7 @@ EOF
test_repo 21/.git
'
test_expect_failure '#21.2: in .git/wt' '
test_expect_success '#21.2: in .git/wt' '
cat >21/.git/wt/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/21/.git
setup: worktree: (null)
@ -3054,7 +3054,7 @@ EOF
test_repo 21/.git/wt
'
test_expect_failure '#21.2: in .git/wt/sub' '
test_expect_success '#21.2: in .git/wt/sub' '
cat >21/.git/wt/sub/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/21/.git
setup: worktree: (null)
@ -3064,7 +3064,7 @@ EOF
test_repo 21/.git/wt/sub
'
test_expect_failure '#21.2: at root' '
test_expect_success '#21.2: at root' '
cat >21/expected <<EOF &&
setup: git_dir: .git
setup: worktree: (null)
@ -3716,7 +3716,7 @@ test_expect_success '#24: setup' '
cd ..
'
test_expect_success '#24: at root' '
test_expect_failure '#24: at root' '
cat >24/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/24.git
setup: worktree: (null)
@ -3726,7 +3726,7 @@ EOF
test_repo 24
'
test_expect_success '#24: in subdir' '
test_expect_failure '#24: in subdir' '
cat >24/sub/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/24.git
setup: worktree: (null)
@ -4151,7 +4151,7 @@ test_expect_success '#28: setup' '
cd ..
'
test_expect_success '#28: at root' '
test_expect_failure '#28: at root' '
cat >28/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/28.git
setup: worktree: (null)
@ -4161,7 +4161,7 @@ EOF
test_repo 28
'
test_expect_success '#28: in subdir' '
test_expect_failure '#28: in subdir' '
cat >28/sub/expected <<EOF &&
setup: git_dir: $TRASH_DIRECTORY/28.git
setup: worktree: (null)