--- t/t1510-repo-setup.sh | 255 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 255 insertions(+), 0 deletions(-) diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh index 20ad6d4..508b7e2 100755 --- a/t/t1510-repo-setup.sh +++ b/t/t1510-repo-setup.sh @@ -202,4 +202,259 @@ EOF GIT_DIR=../.git test_repo 2/sub ' +# +# case #3 +# +############################################################ +# +# Input: +# +# - GIT_WORK_TREE is set +# - GIT_DIR is set +# - core.worktree is not set +# - .git is a directory +# - core.bare is not set, cwd is outside .git +# +# Output: +# +# - worktree is set to $GIT_WORK_TREE +# - cwd is at worktree root +# - prefix is calculated +# - git_dir is set to $GIT_DIR +# - cwd can be outside worktree + +test_expect_success '#3: setup' ' + unset GIT_DIR GIT_WORK_TREE && + mkdir 3 3/sub 3/sub/sub 3.wt 3.wt/sub 3/wt 3/wt/sub && + cd 3 && git init && cd .. +' + +test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE at root' ' + cat >3/expected <<EOF && +.git +$TRASH_DIRECTORY/3 +$TRASH_DIRECTORY/3 +EOF + GIT_DIR=.git GIT_WORK_TREE="$TRASH_DIRECTORY/3" test_repo 3 +' + +test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE(rel) at root' ' + cat >3/expected <<EOF && +.git +$TRASH_DIRECTORY/3 +$TRASH_DIRECTORY/3 +EOF + GIT_DIR=.git GIT_WORK_TREE=. test_repo 3 +' + +test_expect_success '#3: GIT_DIR, GIT_WORK_TREE at root' ' + cat >3/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY/3 +$TRASH_DIRECTORY/3 +EOF + GIT_DIR="$TRASH_DIRECTORY/3/.git" GIT_WORK_TREE="$TRASH_DIRECTORY/3" test_repo 3 +' + +test_expect_success '#3: GIT_DIR, GIT_WORK_TREE(rel) at root' ' + cat >3/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY/3 +$TRASH_DIRECTORY/3 +EOF + GIT_DIR="$TRASH_DIRECTORY/3/.git" GIT_WORK_TREE=. test_repo 3 +' + +test_expect_success '#3: GIT_DIR(rel), GIT_WORKTREE in subdir' ' + cat >3/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY/3 +$TRASH_DIRECTORY/3 +sub/sub/ +EOF + GIT_DIR=../../.git GIT_WORK_TREE="$TRASH_DIRECTORY/3" test_repo 3/sub/sub +' + +test_expect_success '#3: GIT_DIR(rel), GIT_WORKTREE(rel) in subdir' ' + cat >3/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY/3 +$TRASH_DIRECTORY/3 +sub/sub/ +EOF + GIT_DIR=../../.git GIT_WORK_TREE=../.. test_repo 3/sub/sub +' + +test_expect_success '#3: GIT_DIR, GIT_WORKTREE in subdir' ' + cat >3/sub/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY/3 +$TRASH_DIRECTORY/3 +sub/ +EOF + GIT_DIR="$TRASH_DIRECTORY/3/.git" GIT_WORK_TREE="$TRASH_DIRECTORY/3" test_repo 3/sub +' + +test_expect_success '#3: GIT_DIR, GIT_WORKTREE(rel) in subdir' ' + cat >3/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY/3 +$TRASH_DIRECTORY/3 +sub/sub/ +EOF + GIT_DIR="$TRASH_DIRECTORY/3/.git" GIT_WORK_TREE=../.. test_repo 3/sub/sub +' + +test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=wt at root' ' + cat >3/expected <<EOF && +.git +$TRASH_DIRECTORY/3/wt +$TRASH_DIRECTORY/3 +EOF + GIT_DIR=.git GIT_WORK_TREE="$TRASH_DIRECTORY/3/wt" test_repo 3 +' + +test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=wt(rel) at root' ' + cat >3/expected <<EOF && +.git +$TRASH_DIRECTORY/3/wt +$TRASH_DIRECTORY/3 +EOF + GIT_DIR=.git GIT_WORK_TREE=wt test_repo 3 +' + +test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=wt(rel) at root' ' + cat >3/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY/3/wt +$TRASH_DIRECTORY/3 +EOF + GIT_DIR="$TRASH_DIRECTORY/3/.git" GIT_WORK_TREE=wt test_repo 3 +' + +test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=wt at root' ' + cat >3/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY/3/wt +$TRASH_DIRECTORY/3 +EOF + GIT_DIR="$TRASH_DIRECTORY/3/.git" GIT_WORK_TREE="$TRASH_DIRECTORY/3/wt" test_repo 3 +' + +test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=wt in subdir' ' + cat >3/sub/sub/expected <<EOF && +../../.git +$TRASH_DIRECTORY/3/wt +$TRASH_DIRECTORY/3/sub/sub +EOF + GIT_DIR=../../.git GIT_WORK_TREE="$TRASH_DIRECTORY/3/wt" test_repo 3/sub/sub +' + +test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=wt(rel) in subdir' ' + cat >3/sub/sub/expected <<EOF && +../../.git +$TRASH_DIRECTORY/3/wt +$TRASH_DIRECTORY/3/sub/sub +EOF + GIT_DIR=../../.git GIT_WORK_TREE=../../wt test_repo 3/sub/sub +' + +test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=wt(rel) in subdir' ' + cat >3/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY/3/wt +$TRASH_DIRECTORY/3/sub/sub +EOF + GIT_DIR="$TRASH_DIRECTORY/3/.git" GIT_WORK_TREE=../../wt test_repo 3/sub/sub +' + +test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=wt in subdir' ' + cat >3/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY/3/wt +$TRASH_DIRECTORY/3/sub/sub +EOF + GIT_DIR="$TRASH_DIRECTORY/3/.git" GIT_WORK_TREE="$TRASH_DIRECTORY/3/wt" test_repo 3/sub/sub +' + +test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=.. at root' ' + cat >3/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +3/ +EOF + GIT_DIR=.git GIT_WORK_TREE="$TRASH_DIRECTORY" test_repo 3 +' + +test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=..(rel) at root' ' + cat >3/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +3/ +EOF + GIT_DIR=.git GIT_WORK_TREE=.. test_repo 3 +' + +test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=..(rel) at root' ' + cat >3/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +3/ +EOF + GIT_DIR="$TRASH_DIRECTORY/3/.git" GIT_WORK_TREE=.. test_repo 3 +' + +test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=.. at root' ' + cat >3/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +3/ +EOF + GIT_DIR="$TRASH_DIRECTORY/3/.git" GIT_WORK_TREE="$TRASH_DIRECTORY" test_repo 3 +' + +test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=.. in subdir' ' + cat >3/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +3/sub/sub/ +EOF + GIT_DIR=../../.git GIT_WORK_TREE="$TRASH_DIRECTORY" test_repo 3/sub/sub +' + +test_expect_success '#3: GIT_DIR(rel), GIT_WORK_TREE=..(rel) in subdir' ' + cat >3/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +3/sub/sub/ +EOF + GIT_DIR=../../.git GIT_WORK_TREE=../../.. test_repo 3/sub/sub +' + +test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=..(rel) in subdir' ' + cat >3/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +3/sub/sub/ +EOF + GIT_DIR="$TRASH_DIRECTORY/3/.git" GIT_WORK_TREE=../../../ test_repo 3/sub/sub +' + +test_expect_success '#3: GIT_DIR, GIT_WORK_TREE=.. in subdir' ' + cat >3/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/3/.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +3/sub/sub/ +EOF + GIT_DIR="$TRASH_DIRECTORY/3/.git" GIT_WORK_TREE="$TRASH_DIRECTORY" test_repo 3/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