--- t/t1510-repo-setup.sh | 261 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 261 insertions(+), 0 deletions(-) diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh index 7e902b0..2f36bfe 100755 --- a/t/t1510-repo-setup.sh +++ b/t/t1510-repo-setup.sh @@ -1002,4 +1002,265 @@ EOF GIT_DIR="$TRASH_DIRECTORY/6/.git" test_repo 6/sub/sub ' +# +# case #7 +# +############################################################ +# +# Input: +# +# - GIT_WORK_TREE is set +# - GIT_DIR is set +# - core.worktree is set +# - .git is a directory +# - core.bare is not set, cwd is outside .git +# +# Output: +# +# core.worktree is overridden by GIT_WORK_TREE, so this is the same as +# case #3. +# +# - worktree is at $GIT_WORK_TREE +# - cwd is at worktree root +# - prefix is calculated +# - git_dir is at $GIT_DIR +# - cwd can be outside worktree + +test_expect_success '#7: setup' ' + unset GIT_DIR GIT_WORK_TREE && + mkdir 7 7/sub 7/sub/sub 7.wt 7.wt/sub 7/wt 7/wt/sub && + cd 7 && + git init && + git config core.worktree non-existent && + cd .. +' + +test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE at root' ' + cat >7/expected <<EOF && +.git +$TRASH_DIRECTORY/7 +$TRASH_DIRECTORY/7 +EOF + GIT_DIR=.git GIT_WORK_TREE="$TRASH_DIRECTORY/7" test_repo 7 +' + +test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE(rel) at root' ' + cat >7/expected <<EOF && +.git +$TRASH_DIRECTORY/7 +$TRASH_DIRECTORY/7 +EOF + GIT_DIR=.git GIT_WORK_TREE=. test_repo 7 +' + +test_expect_success '#7: GIT_DIR, GIT_WORK_TREE at root' ' + cat >7/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY/7 +$TRASH_DIRECTORY/7 +EOF + GIT_DIR="$TRASH_DIRECTORY/7/.git" GIT_WORK_TREE="$TRASH_DIRECTORY/7" test_repo 7 +' + +test_expect_success '#7: GIT_DIR, GIT_WORK_TREE(rel) at root' ' + cat >7/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY/7 +$TRASH_DIRECTORY/7 +EOF + GIT_DIR="$TRASH_DIRECTORY/7/.git" GIT_WORK_TREE=. test_repo 7 +' + +test_expect_success '#7: GIT_DIR(rel), GIT_WORKTREE in subdir' ' + cat >7/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY/7 +$TRASH_DIRECTORY/7 +sub/sub/ +EOF + GIT_DIR=../../.git GIT_WORK_TREE="$TRASH_DIRECTORY/7" test_repo 7/sub/sub +' + +test_expect_success '#7: GIT_DIR(rel), GIT_WORKTREE(rel) in subdir' ' + cat >7/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY/7 +$TRASH_DIRECTORY/7 +sub/sub/ +EOF + GIT_DIR=../../.git GIT_WORK_TREE=../.. test_repo 7/sub/sub +' + +test_expect_success '#7: GIT_DIR, GIT_WORKTREE in subdir' ' + cat >7/sub/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY/7 +$TRASH_DIRECTORY/7 +sub/ +EOF + GIT_DIR="$TRASH_DIRECTORY/7/.git" GIT_WORK_TREE="$TRASH_DIRECTORY/7" test_repo 7/sub +' + +test_expect_success '#7: GIT_DIR, GIT_WORKTREE(rel) in subdir' ' + cat >7/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY/7 +$TRASH_DIRECTORY/7 +sub/sub/ +EOF + GIT_DIR="$TRASH_DIRECTORY/7/.git" GIT_WORK_TREE=../.. test_repo 7/sub/sub +' + +test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=wt at root' ' + cat >7/expected <<EOF && +.git +$TRASH_DIRECTORY/7/wt +$TRASH_DIRECTORY/7 +EOF + GIT_DIR=.git GIT_WORK_TREE="$TRASH_DIRECTORY/7/wt" test_repo 7 +' + +test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=wt(rel) at root' ' + cat >7/expected <<EOF && +.git +$TRASH_DIRECTORY/7/wt +$TRASH_DIRECTORY/7 +EOF + GIT_DIR=.git GIT_WORK_TREE=wt test_repo 7 +' + +test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=wt(rel) at root' ' + cat >7/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY/7/wt +$TRASH_DIRECTORY/7 +EOF + GIT_DIR="$TRASH_DIRECTORY/7/.git" GIT_WORK_TREE=wt test_repo 7 +' + +test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=wt at root' ' + cat >7/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY/7/wt +$TRASH_DIRECTORY/7 +EOF + GIT_DIR="$TRASH_DIRECTORY/7/.git" GIT_WORK_TREE="$TRASH_DIRECTORY/7/wt" test_repo 7 +' + +test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=wt in subdir' ' + cat >7/sub/sub/expected <<EOF && +../../.git +$TRASH_DIRECTORY/7/wt +$TRASH_DIRECTORY/7/sub/sub +EOF + GIT_DIR=../../.git GIT_WORK_TREE="$TRASH_DIRECTORY/7/wt" test_repo 7/sub/sub +' + +test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=wt(rel) in subdir' ' + cat >7/sub/sub/expected <<EOF && +../../.git +$TRASH_DIRECTORY/7/wt +$TRASH_DIRECTORY/7/sub/sub +EOF + GIT_DIR=../../.git GIT_WORK_TREE=../../wt test_repo 7/sub/sub +' + +test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=wt(rel) in subdir' ' + cat >7/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY/7/wt +$TRASH_DIRECTORY/7/sub/sub +EOF + GIT_DIR="$TRASH_DIRECTORY/7/.git" GIT_WORK_TREE=../../wt test_repo 7/sub/sub +' + +test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=wt in subdir' ' + cat >7/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY/7/wt +$TRASH_DIRECTORY/7/sub/sub +EOF + GIT_DIR="$TRASH_DIRECTORY/7/.git" GIT_WORK_TREE="$TRASH_DIRECTORY/7/wt" test_repo 7/sub/sub +' + +test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=.. at root' ' + cat >7/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +7/ +EOF + GIT_DIR=.git GIT_WORK_TREE="$TRASH_DIRECTORY" test_repo 7 +' + +test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=..(rel) at root' ' + cat >7/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +7/ +EOF + GIT_DIR=.git GIT_WORK_TREE=.. test_repo 7 +' + +test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=..(rel) at root' ' + cat >7/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +7/ +EOF + GIT_DIR="$TRASH_DIRECTORY/7/.git" GIT_WORK_TREE=.. test_repo 7 +' + +test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=.. at root' ' + cat >7/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +7/ +EOF + GIT_DIR="$TRASH_DIRECTORY/7/.git" GIT_WORK_TREE="$TRASH_DIRECTORY" test_repo 7 +' + +test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=.. in subdir' ' + cat >7/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +7/sub/sub/ +EOF + GIT_DIR=../../.git GIT_WORK_TREE="$TRASH_DIRECTORY" test_repo 7/sub/sub +' + +test_expect_success '#7: GIT_DIR(rel), GIT_WORK_TREE=..(rel) in subdir' ' + cat >7/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +7/sub/sub/ +EOF + GIT_DIR=../../.git GIT_WORK_TREE=../../.. test_repo 7/sub/sub +' + +test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=..(rel) in subdir' ' + cat >7/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +7/sub/sub/ +EOF + GIT_DIR="$TRASH_DIRECTORY/7/.git" GIT_WORK_TREE=../../../ test_repo 7/sub/sub +' + +test_expect_success '#7: GIT_DIR, GIT_WORK_TREE=.. in subdir' ' + cat >7/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/7/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +7/sub/sub/ +EOF + GIT_DIR="$TRASH_DIRECTORY/7/.git" GIT_WORK_TREE="$TRASH_DIRECTORY" test_repo 7/sub/sub +' + test_done -- 1.7.0.2.445.gcbdb3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html