--- t/t1510-repo-setup.sh | 256 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 256 insertions(+), 0 deletions(-) diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh index 5c1b96e..f412890 100755 --- a/t/t1510-repo-setup.sh +++ b/t/t1510-repo-setup.sh @@ -2224,4 +2224,260 @@ EOF GIT_DIR="$TRASH_DIRECTORY/14/.git" test_repo 14/sub/sub ' +# +# case #15 +# +############################################################ +# +# Input: +# +# - GIT_WORK_TREE is set +# - GIT_DIR is set +# - core.worktree is set +# - .git is a file +# - core.bare is not set, cwd is outside .git +# +# Output: +# +# same as case #7 except that git_dir is set by .git file + +test_expect_success '#15: setup' ' + unset GIT_DIR GIT_WORK_TREE && + mkdir 15 15/sub 15/sub/sub 15.wt 15.wt/sub 15/wt 15/wt/sub && + cd 15 && + git init && + git config core.worktree non-existent && + mv .git ../15.git && + echo gitdir: ../15.git >.git && + cd .. +' + +test_expect_failure '#15: GIT_DIR(rel), GIT_WORK_TREE at root' ' + cat >15/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15 +$TRASH_DIRECTORY/15 +EOF + GIT_DIR=.git GIT_WORK_TREE="$TRASH_DIRECTORY/15" test_repo 15 +' + +test_expect_failure '#15: GIT_DIR(rel), GIT_WORK_TREE(rel) at root' ' + cat >15/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15 +$TRASH_DIRECTORY/15 +EOF + GIT_DIR=.git GIT_WORK_TREE=. test_repo 15 +' + +test_expect_failure '#15: GIT_DIR, GIT_WORK_TREE at root' ' + cat >15/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15 +$TRASH_DIRECTORY/15 +EOF + GIT_DIR="$TRASH_DIRECTORY/15/.git" GIT_WORK_TREE="$TRASH_DIRECTORY/15" test_repo 15 +' + +test_expect_failure '#15: GIT_DIR, GIT_WORK_TREE(rel) at root' ' + cat >15/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15 +$TRASH_DIRECTORY/15 +EOF + GIT_DIR="$TRASH_DIRECTORY/15/.git" GIT_WORK_TREE=. test_repo 15 +' + +test_expect_failure '#15: GIT_DIR(rel), GIT_WORKTREE in subdir' ' + cat >15/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15 +$TRASH_DIRECTORY/15 +sub/sub/ +EOF + GIT_DIR=../../.git GIT_WORK_TREE="$TRASH_DIRECTORY/15" test_repo 15/sub/sub +' + +test_expect_failure '#15: GIT_DIR(rel), GIT_WORKTREE(rel) in subdir' ' + cat >15/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15 +$TRASH_DIRECTORY/15 +sub/sub/ +EOF + GIT_DIR=../../.git GIT_WORK_TREE=../.. test_repo 15/sub/sub +' + +test_expect_failure '#15: GIT_DIR, GIT_WORKTREE in subdir' ' + cat >15/sub/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15 +$TRASH_DIRECTORY/15 +sub/ +EOF + GIT_DIR="$TRASH_DIRECTORY/15/.git" GIT_WORK_TREE="$TRASH_DIRECTORY/15" test_repo 15/sub +' + +test_expect_failure '#15: GIT_DIR, GIT_WORKTREE(rel) in subdir' ' + cat >15/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15 +$TRASH_DIRECTORY/15 +sub/sub/ +EOF + GIT_DIR="$TRASH_DIRECTORY/15/.git" GIT_WORK_TREE=../.. test_repo 15/sub/sub +' + +test_expect_failure '#15: GIT_DIR(rel), GIT_WORK_TREE=wt at root' ' + cat >15/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15/wt +$TRASH_DIRECTORY/15 +EOF + GIT_DIR=.git GIT_WORK_TREE="$TRASH_DIRECTORY/15/wt" test_repo 15 +' + +test_expect_failure '#15: GIT_DIR(rel), GIT_WORK_TREE=wt(rel) at root' ' + cat >15/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15/wt +$TRASH_DIRECTORY/15 +EOF + GIT_DIR=.git GIT_WORK_TREE=wt test_repo 15 +' + +test_expect_failure '#15: GIT_DIR, GIT_WORK_TREE=wt(rel) at root' ' + cat >15/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15/wt +$TRASH_DIRECTORY/15 +EOF + GIT_DIR="$TRASH_DIRECTORY/15/.git" GIT_WORK_TREE=wt test_repo 15 +' + +test_expect_failure '#15: GIT_DIR, GIT_WORK_TREE=wt at root' ' + cat >15/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15/wt +$TRASH_DIRECTORY/15 +EOF + GIT_DIR="$TRASH_DIRECTORY/15/.git" GIT_WORK_TREE="$TRASH_DIRECTORY/15/wt" test_repo 15 +' + +test_expect_failure '#15: GIT_DIR(rel), GIT_WORK_TREE=wt in subdir' ' + cat >15/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15/wt +$TRASH_DIRECTORY/15/sub/sub +EOF + GIT_DIR=../../.git GIT_WORK_TREE="$TRASH_DIRECTORY/15/wt" test_repo 15/sub/sub +' + +test_expect_failure '#15: GIT_DIR(rel), GIT_WORK_TREE=wt(rel) in subdir' ' + cat >15/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15/wt +$TRASH_DIRECTORY/15/sub/sub +EOF + GIT_DIR=../../.git GIT_WORK_TREE=../../wt test_repo 15/sub/sub +' + +test_expect_failure '#15: GIT_DIR, GIT_WORK_TREE=wt(rel) in subdir' ' + cat >15/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15/wt +$TRASH_DIRECTORY/15/sub/sub +EOF + GIT_DIR="$TRASH_DIRECTORY/15/.git" GIT_WORK_TREE=../../wt test_repo 15/sub/sub +' + +test_expect_failure '#15: GIT_DIR, GIT_WORK_TREE=wt in subdir' ' + cat >15/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY/15/wt +$TRASH_DIRECTORY/15/sub/sub +EOF + GIT_DIR="$TRASH_DIRECTORY/15/.git" GIT_WORK_TREE="$TRASH_DIRECTORY/15/wt" test_repo 15/sub/sub +' + +test_expect_failure '#15: GIT_DIR(rel), GIT_WORK_TREE=.. at root' ' + cat >15/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +15/ +EOF + GIT_DIR=.git GIT_WORK_TREE="$TRASH_DIRECTORY" test_repo 15 +' + +test_expect_failure '#15: GIT_DIR(rel), GIT_WORK_TREE=..(rel) at root' ' + cat >15/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +15/ +EOF + GIT_DIR=.git GIT_WORK_TREE=.. test_repo 15 +' + +test_expect_failure '#15: GIT_DIR, GIT_WORK_TREE=..(rel) at root' ' + cat >15/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +15/ +EOF + GIT_DIR="$TRASH_DIRECTORY/15/.git" GIT_WORK_TREE=.. test_repo 15 +' + +test_expect_failure '#15: GIT_DIR, GIT_WORK_TREE=.. at root' ' + cat >15/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +15/ +EOF + GIT_DIR="$TRASH_DIRECTORY/15/.git" GIT_WORK_TREE="$TRASH_DIRECTORY" test_repo 15 +' + +test_expect_failure '#15: GIT_DIR(rel), GIT_WORK_TREE=.. in subdir' ' + cat >15/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +15/sub/sub/ +EOF + GIT_DIR=../../.git GIT_WORK_TREE="$TRASH_DIRECTORY" test_repo 15/sub/sub +' + +test_expect_failure '#15: GIT_DIR(rel), GIT_WORK_TREE=..(rel) in subdir' ' + cat >15/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +15/sub/sub/ +EOF + GIT_DIR=../../.git GIT_WORK_TREE=../../.. test_repo 15/sub/sub +' + +test_expect_failure '#15: GIT_DIR, GIT_WORK_TREE=..(rel) in subdir' ' + cat >15/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +15/sub/sub/ +EOF + GIT_DIR="$TRASH_DIRECTORY/15/.git" GIT_WORK_TREE=../../../ test_repo 15/sub/sub +' + +test_expect_failure '#15: GIT_DIR, GIT_WORK_TREE=.. in subdir' ' + cat >15/sub/sub/expected <<EOF && +$TRASH_DIRECTORY/15.git +$TRASH_DIRECTORY +$TRASH_DIRECTORY +15/sub/sub/ +EOF + GIT_DIR="$TRASH_DIRECTORY/15/.git" GIT_WORK_TREE="$TRASH_DIRECTORY" test_repo 15/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