changed added/conflicted checking order
[git/mingw/4msysgit/wingit-dll.git] / t / t1501-worktree.sh
blobf6a6f839a18de4c3775ea965f164d0d20f2bbe9b
1 #!/bin/sh
3 test_description='test separate work tree'
4 . ./test-lib.sh
6 test_rev_parse() {
7 name=$1
8 shift
10 test_expect_success "$name: is-bare-repository" \
11 "test '$1' = \"\$(git rev-parse --is-bare-repository)\""
12 shift
13 [ $# -eq 0 ] && return
15 test_expect_success "$name: is-inside-git-dir" \
16 "test '$1' = \"\$(git rev-parse --is-inside-git-dir)\""
17 shift
18 [ $# -eq 0 ] && return
20 test_expect_success "$name: is-inside-work-tree" \
21 "test '$1' = \"\$(git rev-parse --is-inside-work-tree)\""
22 shift
23 [ $# -eq 0 ] && return
25 test_expect_success "$name: prefix" \
26 "test '$1' = \"\$(git rev-parse --show-prefix)\""
27 shift
28 [ $# -eq 0 ] && return
31 EMPTY_TREE=$(git write-tree)
32 mkdir -p work/sub/dir || exit 1
33 mv .git repo.git || exit 1
35 say "core.worktree = relative path"
36 GIT_DIR=repo.git
37 GIT_CONFIG="$(pwd)"/$GIT_DIR/config
38 export GIT_DIR GIT_CONFIG
39 unset GIT_WORK_TREE
40 git config core.worktree ../work
41 test_rev_parse 'outside' false false false
42 cd work || exit 1
43 GIT_DIR=../repo.git
44 GIT_CONFIG="$(pwd)"/$GIT_DIR/config
45 test_rev_parse 'inside' false false true ''
46 cd sub/dir || exit 1
47 GIT_DIR=../../../repo.git
48 GIT_CONFIG="$(pwd)"/$GIT_DIR/config
49 test_rev_parse 'subdirectory' false false true sub/dir/
50 cd ../../.. || exit 1
52 say "core.worktree = absolute path"
53 GIT_DIR=$(pwd)/repo.git
54 GIT_CONFIG=$GIT_DIR/config
55 git config core.worktree "$(pwd)/work"
56 test_rev_parse 'outside' false false false
57 cd work || exit 1
58 test_rev_parse 'inside' false false true ''
59 cd sub/dir || exit 1
60 test_rev_parse 'subdirectory' false false true sub/dir/
61 cd ../../.. || exit 1
63 say "GIT_WORK_TREE=relative path (override core.worktree)"
64 GIT_DIR=$(pwd)/repo.git
65 GIT_CONFIG=$GIT_DIR/config
66 git config core.worktree non-existent
67 GIT_WORK_TREE=work
68 export GIT_WORK_TREE
69 test_rev_parse 'outside' false false false
70 cd work || exit 1
71 GIT_WORK_TREE=.
72 test_rev_parse 'inside' false false true ''
73 cd sub/dir || exit 1
74 GIT_WORK_TREE=../..
75 test_rev_parse 'subdirectory' false false true sub/dir/
76 cd ../../.. || exit 1
78 mv work repo.git/work
80 say "GIT_WORK_TREE=absolute path, work tree below git dir"
81 GIT_DIR=$(pwd)/repo.git
82 GIT_CONFIG=$GIT_DIR/config
83 GIT_WORK_TREE=$(pwd)/repo.git/work
84 test_rev_parse 'outside' false false false
85 cd repo.git || exit 1
86 test_rev_parse 'in repo.git' false true false
87 cd objects || exit 1
88 test_rev_parse 'in repo.git/objects' false true false
89 cd ../work || exit 1
90 test_rev_parse 'in repo.git/work' false true true ''
91 cd sub/dir || exit 1
92 test_rev_parse 'in repo.git/sub/dir' false true true sub/dir/
93 cd ../../../.. || exit 1
95 test_expect_success 'repo finds its work tree' '
96 (cd repo.git &&
97 : > work/sub/dir/untracked &&
98 test sub/dir/untracked = "$(git ls-files --others)")
101 test_expect_success 'repo finds its work tree from work tree, too' '
102 (cd repo.git/work/sub/dir &&
103 : > tracked &&
104 git --git-dir=../../.. add tracked &&
105 cd ../../.. &&
106 test sub/dir/tracked = "$(git ls-files)")
109 test_expect_success '_gently() groks relative GIT_DIR & GIT_WORK_TREE' '
110 (cd repo.git/work/sub/dir &&
111 GIT_DIR=../../.. GIT_WORK_TREE=../.. GIT_PAGER= \
112 git diff --exit-code tracked &&
113 echo changed > tracked &&
114 ! GIT_DIR=../../.. GIT_WORK_TREE=../.. GIT_PAGER= \
115 git diff --exit-code tracked)
117 cat > diff-index-cached.expected <<\EOF
118 :000000 100644 0000000000000000000000000000000000000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 A sub/dir/tracked
120 cat > diff-index.expected <<\EOF
121 :000000 100644 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 A sub/dir/tracked
125 test_expect_success 'git diff-index' '
126 GIT_DIR=repo.git GIT_WORK_TREE=repo.git/work git diff-index $EMPTY_TREE > result &&
127 test_cmp diff-index.expected result &&
128 GIT_DIR=repo.git git diff-index --cached $EMPTY_TREE > result &&
129 test_cmp diff-index-cached.expected result
131 cat >diff-files.expected <<\EOF
132 :100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 M sub/dir/tracked
135 test_expect_success 'git diff-files' '
136 GIT_DIR=repo.git GIT_WORK_TREE=repo.git/work git diff-files > result &&
137 test_cmp diff-files.expected result
140 cat >diff-TREE.expected <<\EOF
141 diff --git a/sub/dir/tracked b/sub/dir/tracked
142 new file mode 100644
143 index 0000000..5ea2ed4
144 --- /dev/null
145 +++ b/sub/dir/tracked
146 @@ -0,0 +1 @@
147 +changed
149 cat >diff-TREE-cached.expected <<\EOF
150 diff --git a/sub/dir/tracked b/sub/dir/tracked
151 new file mode 100644
152 index 0000000..e69de29
154 cat >diff-FILES.expected <<\EOF
155 diff --git a/sub/dir/tracked b/sub/dir/tracked
156 index e69de29..5ea2ed4 100644
157 --- a/sub/dir/tracked
158 +++ b/sub/dir/tracked
159 @@ -0,0 +1 @@
160 +changed
163 test_expect_success 'git diff' '
164 GIT_DIR=repo.git GIT_WORK_TREE=repo.git/work git diff $EMPTY_TREE > result &&
165 test_cmp diff-TREE.expected result &&
166 GIT_DIR=repo.git git diff --cached $EMPTY_TREE > result &&
167 test_cmp diff-TREE-cached.expected result &&
168 GIT_DIR=repo.git GIT_WORK_TREE=repo.git/work git diff > result &&
169 test_cmp diff-FILES.expected result
172 test_expect_success 'git grep' '
173 (cd repo.git/work/sub &&
174 GIT_DIR=../.. GIT_WORK_TREE=.. git grep -l changed | grep dir/tracked)
177 test_done