Most of them are for setup_git_directory_gently() commands as those are likely to break. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> --- t/t1501-worktree.sh | 57 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 2 deletions(-) diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh index 7ee3820..a53c1f5 100755 --- a/t/t1501-worktree.sh +++ b/t/t1501-worktree.sh @@ -47,7 +47,19 @@ export GIT_CONFIG="$(pwd)"/$GIT_DIR/config test_rev_parse 'subdirectory' false false true sub/dir/ cd ../../.. || exit 1 -say "core.worktree = absolute path" +say "core.worktree = absolute path with GIT_DIR unset" +mkdir -p $(pwd)/repo.git/work/sub/dir || exit 1 +unset GIT_DIR +export GIT_CONFIG=$(pwd)/repo.git/config +git config core.worktree "$(pwd)/repo.git/work" +test_rev_parse 'outside' false false false +cd repo.git/work || exit 1 +test_rev_parse 'inside' false true true '' +cd sub/dir || exit 1 +test_rev_parse 'subdirectory' false true true sub/dir/ +cd ../../../.. || exit 1 + +say "core.worktree = absolute path with GIT_DIR set" export GIT_DIR=$(pwd)/repo.git export GIT_CONFIG=$GIT_DIR/config git config core.worktree "$(pwd)/work" @@ -58,6 +70,47 @@ cd sub/dir || exit 1 test_rev_parse 'subdirectory' false false true sub/dir/ cd ../../.. || exit 1 +test_expect_success '"git ls-files -o" gets correct prefix' ' + (cd work/sub && touch untracked && + test "$(git ls-files -o)" = untracked)' + +rm work/sub/untracked || exit 1 + +cat <<EOF >expected +:100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 M sub/tracked +EOF + +cat <<EOF >expected2 +:100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 M tracked +EOF + +test_expect_success '"git diff-files" gets correct prefix' ' + (cd work/sub && touch tracked && + git add tracked && echo modified > tracked && + git diff-files > ../../result && + git diff-files --relative > ../../result2 && + git rm -f tracked) && + cmp result expected && + cmp result2 expected2' + +cat <<EOF >expected +:100644 100644 e69de29... 0000000... M sub/tracked +EOF + +cat <<EOF >expected2 +:100644 100644 e69de29... 0000000... M tracked +EOF + + +test_expect_success '"git diff" gets correct prefix' ' + (cd work/sub && touch tracked && + git add tracked && echo modified > tracked && + git diff --raw > ../../result && + git diff --raw --relative > ../../result2 && + git rm -f tracked) && + cmp result expected && + cmp result2 expected2' + say "GIT_WORK_TREE=relative path (override core.worktree)" export GIT_DIR=$(pwd)/repo.git export GIT_CONFIG=$GIT_DIR/config @@ -103,7 +156,7 @@ test_expect_success 'repo finds its work tree from work tree, too' ' test sub/dir/tracked = "$(git ls-files)") ' -test_expect_success '_gently() groks relative GIT_DIR & GIT_WORK_TREE' ' +test_expect_success '"git diff" setup worktree properly' ' cd repo.git/work/sub/dir && GIT_DIR=../../.. GIT_WORK_TREE=../.. GIT_PAGER= \ git diff --exit-code tracked && -- 1.5.4.2.281.g28d0e -- 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
