#!/bin/sh global test_description := ''test separate work tree'' source ./test-lib.sh test_expect_success 'setup' ' EMPTY_TREE=$(git write-tree) && EMPTY_BLOB=$(git hash-object -t blob --stdin expected.bare && echo $2 >expected.inside-git && echo $3 >expected.inside-worktree && if test $# -ge 4 then echo $4 >expected.prefix fi && git rev-parse --is-bare-repository >actual.bare && git rev-parse --is-inside-git-dir >actual.inside-git && git rev-parse --is-inside-work-tree >actual.inside-worktree && if test $# -ge 4 then git rev-parse --show-prefix >actual.prefix fi && test_cmp expected.bare actual.bare && test_cmp expected.inside-git actual.inside-git && test_cmp expected.inside-worktree actual.inside-worktree && if test $# -ge 4 then # rev-parse --show-prefix should output # a single newline when at the top of the work tree, # but we test for that separately. test -z "$4" && ! test -s actual.prefix || test_cmp expected.prefix actual.prefix fi } ' test_expect_success 'setup: core.worktree = relative path' ' sane_unset GIT_WORK_TREE && GIT_DIR=repo.git && GIT_CONFIG="$(pwd)"/$GIT_DIR/config && export GIT_DIR GIT_CONFIG && git config core.worktree ../work ' test_expect_success 'outside' ' test_rev_parse false false false ' test_expect_success 'inside work tree' ' ( cd work && GIT_DIR=../repo.git && GIT_CONFIG="$(pwd)"/$GIT_DIR/config && test_rev_parse false false true "" ) ' test_expect_success 'empty prefix is actually written out' ' echo >expected && ( cd work && GIT_DIR=../repo.git && GIT_CONFIG="$(pwd)"/$GIT_DIR/config && git rev-parse --show-prefix >../actual ) && test_cmp expected actual ' test_expect_success 'subdir of work tree' ' ( cd work/sub/dir && GIT_DIR=../../../repo.git && GIT_CONFIG="$(pwd)"/$GIT_DIR/config && test_rev_parse false false true sub/dir/ ) ' test_expect_success 'setup: core.worktree = absolute path' ' sane_unset GIT_WORK_TREE && GIT_DIR=$(pwd)/repo.git && GIT_CONFIG=$GIT_DIR/config && export GIT_DIR GIT_CONFIG && git config core.worktree "$(pwd)/work" ' test_expect_success 'outside' ' test_rev_parse false false false && ( cd work2 && test_rev_parse false false false ) ' test_expect_success 'inside work tree' ' ( cd work && test_rev_parse false false true "" ) ' test_expect_success 'subdir of work tree' ' ( cd work/sub/dir && test_rev_parse false false true sub/dir/ ) ' test_expect_success 'setup: GIT_WORK_TREE=relative (override core.worktree)' ' GIT_DIR=$(pwd)/repo.git && GIT_CONFIG=$GIT_DIR/config && git config core.worktree non-existent && GIT_WORK_TREE=work && export GIT_DIR GIT_CONFIG GIT_WORK_TREE ' test_expect_success 'outside' ' test_rev_parse false false false && ( cd work2 && test_rev_parse false false false ) ' test_expect_success 'inside work tree' ' ( cd work && GIT_WORK_TREE=. && test_rev_parse false false true "" ) ' test_expect_success 'subdir of work tree' ' ( cd work/sub/dir && GIT_WORK_TREE=../.. && test_rev_parse false false true sub/dir/ ) ' test_expect_success 'setup: GIT_WORK_TREE=absolute, below git dir' ' mv work repo.git/work && mv work2 repo.git/work2 && GIT_DIR=$(pwd)/repo.git && GIT_CONFIG=$GIT_DIR/config && GIT_WORK_TREE=$(pwd)/repo.git/work && export GIT_DIR GIT_CONFIG GIT_WORK_TREE ' test_expect_success 'outside' ' echo outside && test_rev_parse false false false ' test_expect_success 'in repo.git' ' ( cd repo.git && test_rev_parse false true false ) && ( cd repo.git/objects && test_rev_parse false true false ) && ( cd repo.git/work2 && test_rev_parse false true false ) ' test_expect_success 'inside work tree' ' ( cd repo.git/work && test_rev_parse false true true "" ) ' test_expect_success 'subdir of work tree' ' ( cd repo.git/work/sub/dir && test_rev_parse false true true sub/dir/ ) ' test_expect_success 'find work tree from repo' ' echo sub/dir/untracked >expected && cat <<-\EOF >repo.git/work/.gitignore && expected.* actual.* .gitignore EOF >repo.git/work/sub/dir/untracked && ( cd repo.git && git ls-files --others --exclude-standard >../actual ) && test_cmp expected actual ' test_expect_success 'find work tree from work tree' ' echo sub/dir/tracked >expected && >repo.git/work/sub/dir/tracked && ( cd repo.git/work/sub/dir && git --git-dir=../../.. add tracked ) && ( cd repo.git && git ls-files >../actual ) && test_cmp expected actual ' test_expect_success '_gently() groks relative GIT_DIR & GIT_WORK_TREE' ' ( cd repo.git/work/sub/dir && GIT_DIR=../../.. && GIT_WORK_TREE=../.. && GIT_PAGER= && export GIT_DIR GIT_WORK_TREE GIT_PAGER && git diff --exit-code tracked && echo changed >tracked && test_must_fail git diff --exit-code tracked ) ' test_expect_success 'diff-index respects work tree under .git dir' ' cat >diff-index-cached.expected <<-EOF && :000000 100644 $_z40 $EMPTY_BLOB A sub/dir/tracked EOF cat >diff-index.expected <<-EOF && :000000 100644 $_z40 $_z40 A sub/dir/tracked EOF ( GIT_DIR=repo.git && GIT_WORK_TREE=repo.git/work && export GIT_DIR GIT_WORK_TREE && git diff-index $EMPTY_TREE >diff-index.actual && git diff-index --cached $EMPTY_TREE >diff-index-cached.actual ) && test_cmp diff-index.expected diff-index.actual && test_cmp diff-index-cached.expected diff-index-cached.actual ' test_expect_success 'diff-files respects work tree under .git dir' ' cat >diff-files.expected <<-EOF && :100644 100644 $EMPTY_BLOB $_z40 M sub/dir/tracked EOF ( GIT_DIR=repo.git && GIT_WORK_TREE=repo.git/work && export GIT_DIR GIT_WORK_TREE && git diff-files >diff-files.actual ) && test_cmp diff-files.expected diff-files.actual ' test_expect_success 'git diff respects work tree under .git dir' ' cat >diff-TREE.expected <<-EOF && diff --git a/sub/dir/tracked b/sub/dir/tracked new file mode 100644 index 0000000..$CHANGED_BLOB7 --- /dev/null +++ b/sub/dir/tracked @@ -0,0 +1 @@ +changed EOF cat >diff-TREE-cached.expected <<-EOF && diff --git a/sub/dir/tracked b/sub/dir/tracked new file mode 100644 index 0000000..$EMPTY_BLOB7 EOF cat >diff-FILES.expected <<-EOF && diff --git a/sub/dir/tracked b/sub/dir/tracked index $EMPTY_BLOB7..$CHANGED_BLOB7 100644 --- a/sub/dir/tracked +++ b/sub/dir/tracked @@ -0,0 +1 @@ +changed EOF ( GIT_DIR=repo.git && GIT_WORK_TREE=repo.git/work && export GIT_DIR GIT_WORK_TREE && git diff $EMPTY_TREE >diff-TREE.actual && git diff --cached $EMPTY_TREE >diff-TREE-cached.actual && git diff >diff-FILES.actual ) && test_cmp diff-TREE.expected diff-TREE.actual && test_cmp diff-TREE-cached.expected diff-TREE-cached.actual && test_cmp diff-FILES.expected diff-FILES.actual ' test_expect_success 'git grep' ' echo dir/tracked >expected.grep && ( cd repo.git/work/sub && GIT_DIR=../.. && GIT_WORK_TREE=.. && export GIT_DIR GIT_WORK_TREE && git grep -l changed >../../../actual.grep ) && test_cmp expected.grep actual.grep ' test_expect_success 'git commit' ' ( cd repo.git && GIT_DIR=. GIT_WORK_TREE=work git commit -a -m done ) ' test_expect_success 'absolute pathspec should fail gracefully' ' ( cd repo.git && test_might_fail git config --unset core.worktree && test_must_fail git log HEAD -- /home ) ' test_expect_success 'make_relative_path handles double slashes in GIT_DIR' ' >dummy_file && echo git --git-dir="$(pwd)//repo.git" --work-tree="$(pwd)" add dummy_file && git --git-dir="$(pwd)//repo.git" --work-tree="$(pwd)" add dummy_file ' test_expect_success 'relative $GIT_WORK_TREE and git subprocesses' ' GIT_DIR=repo.git GIT_WORK_TREE=repo.git/work \ test-subprocess --setup-work-tree rev-parse --show-toplevel >actual && echo "$(pwd)/repo.git/work" >expected && test_cmp expected actual ' test_expect_success 'Multi-worktree setup' ' mkdir work && mkdir -p repo.git/repos/foo && cp repo.git/HEAD repo.git/index repo.git/repos/foo && test_might_fail cp repo.git/sharedindex.* repo.git/repos/foo && sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE ' test_expect_success 'GIT_DIR set (1)' ' echo "gitdir: repo.git/repos/foo" >gitfile && echo ../.. >repo.git/repos/foo/commondir && ( cd work && GIT_DIR=../gitfile git rev-parse --git-common-dir >actual && test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && test_cmp expect actual ) ' test_expect_success 'GIT_DIR set (2)' ' echo "gitdir: repo.git/repos/foo" >gitfile && echo "$(pwd)/repo.git" >repo.git/repos/foo/commondir && ( cd work && GIT_DIR=../gitfile git rev-parse --git-common-dir >actual && test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && test_cmp expect actual ) ' test_expect_success 'Auto discovery' ' echo "gitdir: repo.git/repos/foo" >.git && echo ../.. >repo.git/repos/foo/commondir && ( cd work && git rev-parse --git-common-dir >actual && test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && test_cmp expect actual && echo haha >data1 && git add data1 && git ls-files --full-name :/ | grep data1 >actual && echo work/data1 >expect && test_cmp expect actual ) ' test_expect_success '$GIT_DIR/common overrides core.worktree' ' mkdir elsewhere && git --git-dir=repo.git config core.worktree "$TRASH_DIRECTORY/elsewhere" && echo "gitdir: repo.git/repos/foo" >.git && echo ../.. >repo.git/repos/foo/commondir && ( cd work && git rev-parse --git-common-dir >actual && test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && test_cmp expect actual && echo haha >data2 && git add data2 && git ls-files --full-name :/ | grep data2 >actual && echo work/data2 >expect && test_cmp expect actual ) ' test_expect_success '$GIT_WORK_TREE overrides $GIT_DIR/common' ' echo "gitdir: repo.git/repos/foo" >.git && echo ../.. >repo.git/repos/foo/commondir && ( cd work && echo haha >data3 && git --git-dir=../.git --work-tree=. add data3 && git ls-files --full-name -- :/ | grep data3 >actual && echo data3 >expect && test_cmp expect actual ) ' test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <"test separate work tree">)} spids: [4] ) ] spids: [4] ) (C {(.)} {(./test-lib.sh)}) (C {(test_expect_success)} {(SQ )} { (SQ <"\n"> <"\tEMPTY_TREE=$(git write-tree) &&\n"> <"\tEMPTY_BLOB=$(git hash-object -t blob --stdin <"\tCHANGED_BLOB=$(echo changed | git hash-object -t blob --stdin) &&\n"> <"\tEMPTY_BLOB7=$(echo $EMPTY_BLOB | sed \"s/\\(.......\\).*/\\1/\") &&\n"> <"\tCHANGED_BLOB7=$(echo $CHANGED_BLOB | sed \"s/\\(.......\\).*/\\1/\") &&\n"> <"\n"> <"\tmkdir -p work/sub/dir &&\n"> <"\tmkdir -p work2 &&\n"> <"\tmv .git repo.git\n"> ) } ) (C {(test_expect_success)} {(SQ <"setup: helper for testing rev-parse">)} { (SQ <"\n"> <"\ttest_rev_parse() {\n"> <"\t\techo $1 >expected.bare &&\n"> <"\t\techo $2 >expected.inside-git &&\n"> <"\t\techo $3 >expected.inside-worktree &&\n"> <"\t\tif test $# -ge 4\n"> <"\t\tthen\n"> <"\t\t\techo $4 >expected.prefix\n"> <"\t\tfi &&\n"> <"\n"> <"\t\tgit rev-parse --is-bare-repository >actual.bare &&\n"> <"\t\tgit rev-parse --is-inside-git-dir >actual.inside-git &&\n"> <"\t\tgit rev-parse --is-inside-work-tree >actual.inside-worktree &&\n"> <"\t\tif test $# -ge 4\n"> <"\t\tthen\n"> <"\t\t\tgit rev-parse --show-prefix >actual.prefix\n"> <"\t\tfi &&\n"> <"\n"> <"\t\ttest_cmp expected.bare actual.bare &&\n"> <"\t\ttest_cmp expected.inside-git actual.inside-git &&\n"> <"\t\ttest_cmp expected.inside-worktree actual.inside-worktree &&\n"> <"\t\tif test $# -ge 4\n"> <"\t\tthen\n"> <"\t\t\t# rev-parse --show-prefix should output\n"> <"\t\t\t# a single newline when at the top of the work tree,\n"> <"\t\t\t# but we test for that separately.\n"> <"\t\t\ttest -z \"$4\" && ! test -s actual.prefix ||\n"> <"\t\t\ttest_cmp expected.prefix actual.prefix\n"> <"\t\tfi\n"> <"\t}\n"> ) } ) (C {(test_expect_success)} {(SQ <"setup: core.worktree = relative path">)} { (SQ <"\n"> <"\tsane_unset GIT_WORK_TREE &&\n"> <"\tGIT_DIR=repo.git &&\n"> <"\tGIT_CONFIG=\"$(pwd)\"/$GIT_DIR/config &&\n"> <"\texport GIT_DIR GIT_CONFIG &&\n"> <"\tgit config core.worktree ../work\n"> ) } ) (C {(test_expect_success)} {(SQ )} {(SQ <"\n"> <"\ttest_rev_parse false false false\n">)}) (C {(test_expect_success)} {(SQ <"inside work tree">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tGIT_DIR=../repo.git &&\n"> <"\t\tGIT_CONFIG=\"$(pwd)\"/$GIT_DIR/config &&\n"> <"\t\ttest_rev_parse false false true \"\"\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"empty prefix is actually written out">)} { (SQ <"\n"> <"\techo >expected &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tGIT_DIR=../repo.git &&\n"> <"\t\tGIT_CONFIG=\"$(pwd)\"/$GIT_DIR/config &&\n"> <"\t\tgit rev-parse --show-prefix >../actual\n"> <"\t) &&\n"> <"\ttest_cmp expected actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"subdir of work tree">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/sub/dir &&\n"> <"\t\tGIT_DIR=../../../repo.git &&\n"> <"\t\tGIT_CONFIG=\"$(pwd)\"/$GIT_DIR/config &&\n"> <"\t\ttest_rev_parse false false true sub/dir/\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"setup: core.worktree = absolute path">)} { (SQ <"\n"> <"\tsane_unset GIT_WORK_TREE &&\n"> <"\tGIT_DIR=$(pwd)/repo.git &&\n"> <"\tGIT_CONFIG=$GIT_DIR/config &&\n"> <"\texport GIT_DIR GIT_CONFIG &&\n"> <"\tgit config core.worktree \"$(pwd)/work\"\n"> ) } ) (C {(test_expect_success)} {(SQ )} { (SQ <"\n"> <"\ttest_rev_parse false false false &&\n"> <"\t(\n"> <"\t\tcd work2 &&\n"> <"\t\ttest_rev_parse false false false\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"inside work tree">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\ttest_rev_parse false false true \"\"\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"subdir of work tree">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/sub/dir &&\n"> <"\t\ttest_rev_parse false false true sub/dir/\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"setup: GIT_WORK_TREE=relative (override core.worktree)">)} { (SQ <"\n"> <"\tGIT_DIR=$(pwd)/repo.git &&\n"> <"\tGIT_CONFIG=$GIT_DIR/config &&\n"> <"\tgit config core.worktree non-existent &&\n"> <"\tGIT_WORK_TREE=work &&\n"> <"\texport GIT_DIR GIT_CONFIG GIT_WORK_TREE\n"> ) } ) (C {(test_expect_success)} {(SQ )} { (SQ <"\n"> <"\ttest_rev_parse false false false &&\n"> <"\t(\n"> <"\t\tcd work2 &&\n"> <"\t\ttest_rev_parse false false false\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"inside work tree">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tGIT_WORK_TREE=. &&\n"> <"\t\ttest_rev_parse false false true \"\"\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"subdir of work tree">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/sub/dir &&\n"> <"\t\tGIT_WORK_TREE=../.. &&\n"> <"\t\ttest_rev_parse false false true sub/dir/\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"setup: GIT_WORK_TREE=absolute, below git dir">)} { (SQ <"\n"> <"\tmv work repo.git/work &&\n"> <"\tmv work2 repo.git/work2 &&\n"> <"\tGIT_DIR=$(pwd)/repo.git &&\n"> <"\tGIT_CONFIG=$GIT_DIR/config &&\n"> <"\tGIT_WORK_TREE=$(pwd)/repo.git/work &&\n"> <"\texport GIT_DIR GIT_CONFIG GIT_WORK_TREE\n"> ) } ) (C {(test_expect_success)} {(SQ )} {(SQ <"\n"> <"\techo outside &&\n"> <"\ttest_rev_parse false false false\n">)} ) (C {(test_expect_success)} {(SQ <"in repo.git">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd repo.git &&\n"> <"\t\ttest_rev_parse false true false\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd repo.git/objects &&\n"> <"\t\ttest_rev_parse false true false\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd repo.git/work2 &&\n"> <"\t\ttest_rev_parse false true false\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"inside work tree">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd repo.git/work &&\n"> <"\t\ttest_rev_parse false true true \"\"\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"subdir of work tree">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd repo.git/work/sub/dir &&\n"> <"\t\ttest_rev_parse false true true sub/dir/\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"find work tree from repo">)} { (SQ <"\n"> <"\techo sub/dir/untracked >expected &&\n"> <"\tcat <<-\\EOF >repo.git/work/.gitignore &&\n"> <"\texpected.*\n"> <"\tactual.*\n"> <"\t.gitignore\n"> <"\tEOF\n"> <"\t>repo.git/work/sub/dir/untracked &&\n"> <"\t(\n"> <"\t\tcd repo.git &&\n"> <"\t\tgit ls-files --others --exclude-standard >../actual\n"> <"\t) &&\n"> <"\ttest_cmp expected actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"find work tree from work tree">)} { (SQ <"\n"> <"\techo sub/dir/tracked >expected &&\n"> <"\t>repo.git/work/sub/dir/tracked &&\n"> <"\t(\n"> <"\t\tcd repo.git/work/sub/dir &&\n"> <"\t\tgit --git-dir=../../.. add tracked\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd repo.git &&\n"> <"\t\tgit ls-files >../actual\n"> <"\t) &&\n"> <"\ttest_cmp expected actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"_gently() groks relative GIT_DIR & GIT_WORK_TREE">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd repo.git/work/sub/dir &&\n"> <"\t\tGIT_DIR=../../.. &&\n"> <"\t\tGIT_WORK_TREE=../.. &&\n"> <"\t\tGIT_PAGER= &&\n"> <"\t\texport GIT_DIR GIT_WORK_TREE GIT_PAGER &&\n"> <"\n"> <"\t\tgit diff --exit-code tracked &&\n"> <"\t\techo changed >tracked &&\n"> <"\t\ttest_must_fail git diff --exit-code tracked\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"diff-index respects work tree under .git dir">)} { (SQ <"\n"> <"\tcat >diff-index-cached.expected <<-EOF &&\n"> <"\t:000000 100644 $_z40 $EMPTY_BLOB A\tsub/dir/tracked\n"> <"\tEOF\n"> <"\tcat >diff-index.expected <<-EOF &&\n"> <"\t:000000 100644 $_z40 $_z40 A\tsub/dir/tracked\n"> <"\tEOF\n"> <"\n"> <"\t(\n"> <"\t\tGIT_DIR=repo.git &&\n"> <"\t\tGIT_WORK_TREE=repo.git/work &&\n"> <"\t\texport GIT_DIR GIT_WORK_TREE &&\n"> <"\t\tgit diff-index $EMPTY_TREE >diff-index.actual &&\n"> <"\t\tgit diff-index --cached $EMPTY_TREE >diff-index-cached.actual\n"> <"\t) &&\n"> <"\ttest_cmp diff-index.expected diff-index.actual &&\n"> <"\ttest_cmp diff-index-cached.expected diff-index-cached.actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"diff-files respects work tree under .git dir">)} { (SQ <"\n"> <"\tcat >diff-files.expected <<-EOF &&\n"> <"\t:100644 100644 $EMPTY_BLOB $_z40 M\tsub/dir/tracked\n"> <"\tEOF\n"> <"\n"> <"\t(\n"> <"\t\tGIT_DIR=repo.git &&\n"> <"\t\tGIT_WORK_TREE=repo.git/work &&\n"> <"\t\texport GIT_DIR GIT_WORK_TREE &&\n"> <"\t\tgit diff-files >diff-files.actual\n"> <"\t) &&\n"> <"\ttest_cmp diff-files.expected diff-files.actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"git diff respects work tree under .git dir">)} { (SQ <"\n"> <"\tcat >diff-TREE.expected <<-EOF &&\n"> <"\tdiff --git a/sub/dir/tracked b/sub/dir/tracked\n"> <"\tnew file mode 100644\n"> <"\tindex 0000000..$CHANGED_BLOB7\n"> <"\t--- /dev/null\n"> <"\t+++ b/sub/dir/tracked\n"> <"\t@@ -0,0 +1 @@\n"> <"\t+changed\n"> <"\tEOF\n"> <"\tcat >diff-TREE-cached.expected <<-EOF &&\n"> <"\tdiff --git a/sub/dir/tracked b/sub/dir/tracked\n"> <"\tnew file mode 100644\n"> <"\tindex 0000000..$EMPTY_BLOB7\n"> <"\tEOF\n"> <"\tcat >diff-FILES.expected <<-EOF &&\n"> <"\tdiff --git a/sub/dir/tracked b/sub/dir/tracked\n"> <"\tindex $EMPTY_BLOB7..$CHANGED_BLOB7 100644\n"> <"\t--- a/sub/dir/tracked\n"> <"\t+++ b/sub/dir/tracked\n"> <"\t@@ -0,0 +1 @@\n"> <"\t+changed\n"> <"\tEOF\n"> <"\n"> <"\t(\n"> <"\t\tGIT_DIR=repo.git &&\n"> <"\t\tGIT_WORK_TREE=repo.git/work &&\n"> <"\t\texport GIT_DIR GIT_WORK_TREE &&\n"> <"\t\tgit diff $EMPTY_TREE >diff-TREE.actual &&\n"> <"\t\tgit diff --cached $EMPTY_TREE >diff-TREE-cached.actual &&\n"> <"\t\tgit diff >diff-FILES.actual\n"> <"\t) &&\n"> <"\ttest_cmp diff-TREE.expected diff-TREE.actual &&\n"> <"\ttest_cmp diff-TREE-cached.expected diff-TREE-cached.actual &&\n"> <"\ttest_cmp diff-FILES.expected diff-FILES.actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"git grep">)} { (SQ <"\n"> <"\techo dir/tracked >expected.grep &&\n"> <"\t(\n"> <"\t\tcd repo.git/work/sub &&\n"> <"\t\tGIT_DIR=../.. &&\n"> <"\t\tGIT_WORK_TREE=.. &&\n"> <"\t\texport GIT_DIR GIT_WORK_TREE &&\n"> <"\t\tgit grep -l changed >../../../actual.grep\n"> <"\t) &&\n"> <"\ttest_cmp expected.grep actual.grep\n"> ) } ) (C {(test_expect_success)} {(SQ <"git commit">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd repo.git &&\n"> <"\t\tGIT_DIR=. GIT_WORK_TREE=work git commit -a -m done\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"absolute pathspec should fail gracefully">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd repo.git &&\n"> <"\t\ttest_might_fail git config --unset core.worktree &&\n"> <"\t\ttest_must_fail git log HEAD -- /home\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"make_relative_path handles double slashes in GIT_DIR">)} { (SQ <"\n"> <"\t>dummy_file &&\n"> <"\techo git --git-dir=\"$(pwd)//repo.git\" --work-tree=\"$(pwd)\" add dummy_file &&\n"> <"\tgit --git-dir=\"$(pwd)//repo.git\" --work-tree=\"$(pwd)\" add dummy_file\n"> ) } ) (C {(test_expect_success)} {(SQ <"relative $GIT_WORK_TREE and git subprocesses">)} { (SQ <"\n"> <"\tGIT_DIR=repo.git GIT_WORK_TREE=repo.git/work \\\n"> <"\ttest-subprocess --setup-work-tree rev-parse --show-toplevel >actual &&\n"> <"\techo \"$(pwd)/repo.git/work\" >expected &&\n"> <"\ttest_cmp expected actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"Multi-worktree setup">)} { (SQ <"\n"> <"\tmkdir work &&\n"> <"\tmkdir -p repo.git/repos/foo &&\n"> <"\tcp repo.git/HEAD repo.git/index repo.git/repos/foo &&\n"> <"\ttest_might_fail cp repo.git/sharedindex.* repo.git/repos/foo &&\n"> <"\tsane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE\n"> ) } ) (C {(test_expect_success)} {(SQ <"GIT_DIR set (1)">)} { (SQ <"\n"> <"\techo \"gitdir: repo.git/repos/foo\" >gitfile &&\n"> <"\techo ../.. >repo.git/repos/foo/commondir &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tGIT_DIR=../gitfile git rev-parse --git-common-dir >actual &&\n"> <"\t\ttest-path-utils real_path \"$TRASH_DIRECTORY/repo.git\" >expect &&\n"> <"\t\ttest_cmp expect actual\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"GIT_DIR set (2)">)} { (SQ <"\n"> <"\techo \"gitdir: repo.git/repos/foo\" >gitfile &&\n"> <"\techo \"$(pwd)/repo.git\" >repo.git/repos/foo/commondir &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tGIT_DIR=../gitfile git rev-parse --git-common-dir >actual &&\n"> <"\t\ttest-path-utils real_path \"$TRASH_DIRECTORY/repo.git\" >expect &&\n"> <"\t\ttest_cmp expect actual\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"Auto discovery">)} { (SQ <"\n"> <"\techo \"gitdir: repo.git/repos/foo\" >.git &&\n"> <"\techo ../.. >repo.git/repos/foo/commondir &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit rev-parse --git-common-dir >actual &&\n"> <"\t\ttest-path-utils real_path \"$TRASH_DIRECTORY/repo.git\" >expect &&\n"> <"\t\ttest_cmp expect actual &&\n"> <"\t\techo haha >data1 &&\n"> <"\t\tgit add data1 &&\n"> <"\t\tgit ls-files --full-name :/ | grep data1 >actual &&\n"> <"\t\techo work/data1 >expect &&\n"> <"\t\ttest_cmp expect actual\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"$GIT_DIR/common overrides core.worktree">)} { (SQ <"\n"> <"\tmkdir elsewhere &&\n"> <"\tgit --git-dir=repo.git config core.worktree \"$TRASH_DIRECTORY/elsewhere\" &&\n"> <"\techo \"gitdir: repo.git/repos/foo\" >.git &&\n"> <"\techo ../.. >repo.git/repos/foo/commondir &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit rev-parse --git-common-dir >actual &&\n"> <"\t\ttest-path-utils real_path \"$TRASH_DIRECTORY/repo.git\" >expect &&\n"> <"\t\ttest_cmp expect actual &&\n"> <"\t\techo haha >data2 &&\n"> <"\t\tgit add data2 &&\n"> <"\t\tgit ls-files --full-name :/ | grep data2 >actual &&\n"> <"\t\techo work/data2 >expect &&\n"> <"\t\ttest_cmp expect actual\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"$GIT_WORK_TREE overrides $GIT_DIR/common">)} { (SQ <"\n"> <"\techo \"gitdir: repo.git/repos/foo\" >.git &&\n"> <"\techo ../.. >repo.git/repos/foo/commondir &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\techo haha >data3 &&\n"> <"\t\tgit --git-dir=../.git --work-tree=. add data3 &&\n"> <"\t\tgit ls-files --full-name -- :/ | grep data3 >actual &&\n"> <"\t\techo data3 >expect &&\n"> <"\t\ttest_cmp expect actual\n"> <"\t)\n"> ) } ) (C {(test_done)}) ] )