blob: 0c74beedd22600e8dfe852393a5a9a36350cfeb5 [file] [log] [blame]
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +07001#!/bin/sh
2
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +07003test_description='sparse checkout tests
4
5* (tag: removed, master) removed
6| D sub/added
7* (HEAD, tag: top) modified and added
8| M init.t
9| A sub/added
10* (tag: init) init
11 A init.t
12'
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070013
14. ./test-lib.sh
Jens Lehmannea5070c2011-05-25 22:10:41 +020015. "$TEST_DIRECTORY"/lib-read-tree.sh
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070016
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070017test_expect_success 'setup' '
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070018 cat >expected <<-\EOF &&
19 100644 77f0ba1734ed79d12881f81b36ee134de6a3327b 0 init.t
20 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 sub/added
Nguyễn Thái Ngọc Duyd61ebbe2011-05-02 19:47:43 +070021 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 sub/addedtoo
Nguyễn Thái Ngọc Duyae3cdfe2010-11-08 01:04:58 +070022 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 subsub/added
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070023 EOF
24 cat >expected.swt <<-\EOF &&
25 H init.t
26 H sub/added
Nguyễn Thái Ngọc Duyd61ebbe2011-05-02 19:47:43 +070027 H sub/addedtoo
Nguyễn Thái Ngọc Duyae3cdfe2010-11-08 01:04:58 +070028 H subsub/added
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070029 EOF
30
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070031 test_commit init &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070032 echo modified >>init.t &&
Nguyễn Thái Ngọc Duyae3cdfe2010-11-08 01:04:58 +070033 mkdir sub subsub &&
Nguyễn Thái Ngọc Duyd61ebbe2011-05-02 19:47:43 +070034 touch sub/added sub/addedtoo subsub/added &&
35 git add init.t sub/added sub/addedtoo subsub/added &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070036 git commit -m "modified and added" &&
37 git tag top &&
38 git rm sub/added &&
39 git commit -m removed &&
40 git tag removed &&
41 git checkout top &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070042 git ls-files --stage >result &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070043 test_cmp expected result
44'
45
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070046test_expect_success 'read-tree without .git/info/sparse-checkout' '
Jens Lehmannea5070c2011-05-25 22:10:41 +020047 read_tree_u_must_succeed -m -u HEAD &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070048 git ls-files --stage >result &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070049 test_cmp expected result &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070050 git ls-files -t >result &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070051 test_cmp expected.swt result
52'
53
54test_expect_success 'read-tree with .git/info/sparse-checkout but disabled' '
Jonathan Niedera48fcd82010-10-30 20:46:54 -050055 echo >.git/info/sparse-checkout &&
Jens Lehmannea5070c2011-05-25 22:10:41 +020056 read_tree_u_must_succeed -m -u HEAD &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070057 git ls-files -t >result &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070058 test_cmp expected.swt result &&
59 test -f init.t &&
60 test -f sub/added
61'
62
63test_expect_success 'read-tree --no-sparse-checkout with empty .git/info/sparse-checkout and enabled' '
64 git config core.sparsecheckout true &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070065 echo >.git/info/sparse-checkout &&
Jens Lehmannea5070c2011-05-25 22:10:41 +020066 read_tree_u_must_succeed --no-sparse-checkout -m -u HEAD &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070067 git ls-files -t >result &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070068 test_cmp expected.swt result &&
69 test -f init.t &&
70 test -f sub/added
71'
72
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070073test_expect_success 'read-tree with empty .git/info/sparse-checkout' '
74 git config core.sparsecheckout true &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070075 echo >.git/info/sparse-checkout &&
Jens Lehmannea5070c2011-05-25 22:10:41 +020076 read_tree_u_must_fail -m -u HEAD &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070077 git ls-files --stage >result &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070078 test_cmp expected result &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070079 git ls-files -t >result &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070080 test_cmp expected.swt result &&
Nguyễn Thái Ngọc Duy9e1afb12009-08-20 20:47:13 +070081 test -f init.t &&
82 test -f sub/added
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070083'
84
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070085test_expect_success 'match directories with trailing slash' '
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070086 cat >expected.swt-noinit <<-\EOF &&
87 S init.t
88 H sub/added
Nguyễn Thái Ngọc Duyd61ebbe2011-05-02 19:47:43 +070089 H sub/addedtoo
Nguyễn Thái Ngọc Duyae3cdfe2010-11-08 01:04:58 +070090 S subsub/added
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070091 EOF
92
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070093 echo sub/ > .git/info/sparse-checkout &&
Jens Lehmannea5070c2011-05-25 22:10:41 +020094 read_tree_u_must_succeed -m -u HEAD &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070095 git ls-files -t > result &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +070096 test_cmp expected.swt-noinit result &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +070097 test ! -f init.t &&
98 test -f sub/added
99'
100
Nguyễn Thái Ngọc Duy90370262010-11-27 01:17:46 +0700101test_expect_success 'match directories without trailing slash' '
Nguyễn Thái Ngọc Duyd61ebbe2011-05-02 19:47:43 +0700102 echo sub >.git/info/sparse-checkout &&
Jens Lehmannea5070c2011-05-25 22:10:41 +0200103 read_tree_u_must_succeed -m -u HEAD &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +0700104 git ls-files -t >result &&
Nguyễn Thái Ngọc Duy90370262010-11-27 01:17:46 +0700105 test_cmp expected.swt-noinit result &&
106 test ! -f init.t &&
107 test -f sub/added
108'
109
Nguyễn Thái Ngọc Duy28911092011-05-09 22:43:01 +0700110test_expect_success 'match directories with negated patterns' '
111 cat >expected.swt-negation <<\EOF &&
112S init.t
113S sub/added
114H sub/addedtoo
115S subsub/added
116EOF
117
118 cat >.git/info/sparse-checkout <<\EOF &&
119sub
120!sub/added
121EOF
122 git read-tree -m -u HEAD &&
123 git ls-files -t >result &&
124 test_cmp expected.swt-negation result &&
125 test ! -f init.t &&
126 test ! -f sub/added &&
127 test -f sub/addedtoo
128'
129
130test_expect_success 'match directories with negated patterns (2)' '
131 cat >expected.swt-negation2 <<\EOF &&
132H init.t
133H sub/added
134S sub/addedtoo
135H subsub/added
136EOF
137
138 cat >.git/info/sparse-checkout <<\EOF &&
139/*
140!sub
141sub/added
142EOF
143 git read-tree -m -u HEAD &&
144 git ls-files -t >result &&
145 test_cmp expected.swt-negation2 result &&
146 test -f init.t &&
147 test -f sub/added &&
148 test ! -f sub/addedtoo
149'
150
Nguyễn Thái Ngọc Duy90370262010-11-27 01:17:46 +0700151test_expect_success 'match directory pattern' '
Nguyễn Thái Ngọc Duyd61ebbe2011-05-02 19:47:43 +0700152 echo "s?b" >.git/info/sparse-checkout &&
Jens Lehmannea5070c2011-05-25 22:10:41 +0200153 read_tree_u_must_succeed -m -u HEAD &&
Nguyễn Thái Ngọc Duy90370262010-11-27 01:17:46 +0700154 git ls-files -t >result &&
155 test_cmp expected.swt-noinit result &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700156 test ! -f init.t &&
157 test -f sub/added
158'
159
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700160test_expect_success 'checkout area changes' '
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +0700161 cat >expected.swt-nosub <<-\EOF &&
162 H init.t
163 S sub/added
Nguyễn Thái Ngọc Duyd61ebbe2011-05-02 19:47:43 +0700164 S sub/addedtoo
Nguyễn Thái Ngọc Duyae3cdfe2010-11-08 01:04:58 +0700165 S subsub/added
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +0700166 EOF
167
168 echo init.t >.git/info/sparse-checkout &&
Jens Lehmannea5070c2011-05-25 22:10:41 +0200169 read_tree_u_must_succeed -m -u HEAD &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +0700170 git ls-files -t >result &&
171 test_cmp expected.swt-nosub result &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700172 test -f init.t &&
173 test ! -f sub/added
174'
175
176test_expect_success 'read-tree updates worktree, absent case' '
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +0700177 echo sub/added >.git/info/sparse-checkout &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700178 git checkout -f top &&
Jens Lehmannea5070c2011-05-25 22:10:41 +0200179 read_tree_u_must_succeed -m -u HEAD^ &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700180 test ! -f init.t
181'
182
183test_expect_success 'read-tree updates worktree, dirty case' '
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +0700184 echo sub/added >.git/info/sparse-checkout &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700185 git checkout -f top &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +0700186 echo dirty >init.t &&
Jens Lehmannea5070c2011-05-25 22:10:41 +0200187 read_tree_u_must_succeed -m -u HEAD^ &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700188 grep -q dirty init.t &&
189 rm init.t
190'
191
192test_expect_success 'read-tree removes worktree, dirty case' '
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +0700193 echo init.t >.git/info/sparse-checkout &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700194 git checkout -f top &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +0700195 echo dirty >added &&
Jens Lehmannea5070c2011-05-25 22:10:41 +0200196 read_tree_u_must_succeed -m -u HEAD^ &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700197 grep -q dirty added
198'
199
200test_expect_success 'read-tree adds to worktree, absent case' '
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +0700201 echo init.t >.git/info/sparse-checkout &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700202 git checkout -f removed &&
Jens Lehmannea5070c2011-05-25 22:10:41 +0200203 read_tree_u_must_succeed -u -m HEAD^ &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700204 test ! -f sub/added
205'
206
Nguyễn Thái Ngọc Duy74da98f2010-07-31 13:14:29 +0700207test_expect_success 'read-tree adds to worktree, dirty case' '
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +0700208 echo init.t >.git/info/sparse-checkout &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700209 git checkout -f removed &&
210 mkdir sub &&
Jonathan Nieder7f71a6a2010-07-31 13:14:25 +0700211 echo dirty >sub/added &&
Jens Lehmannea5070c2011-05-25 22:10:41 +0200212 read_tree_u_must_succeed -u -m HEAD^ &&
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700213 grep -q dirty sub/added
214'
215
Nguyễn Thái Ngọc Duyeec3fc02010-07-31 13:14:26 +0700216test_expect_success 'index removal and worktree narrowing at the same time' '
217 >empty &&
218 echo init.t >.git/info/sparse-checkout &&
219 echo sub/added >>.git/info/sparse-checkout &&
220 git checkout -f top &&
221 echo init.t >.git/info/sparse-checkout &&
222 git checkout removed &&
223 git ls-files sub/added >result &&
224 test ! -f sub/added &&
225 test_cmp empty result
226'
227
Nguyễn Thái Ngọc Duy700e66d2010-07-31 13:14:27 +0700228test_expect_success 'read-tree --reset removes outside worktree' '
229 >empty &&
230 echo init.t >.git/info/sparse-checkout &&
231 git checkout -f top &&
232 git reset --hard removed &&
233 git ls-files sub/added >result &&
234 test_cmp empty result
235'
236
Nguyễn Thái Ngọc Duy17d26a42011-09-22 21:24:22 +1000237test_expect_success 'print errors when failed to update worktree' '
238 echo sub >.git/info/sparse-checkout &&
239 git checkout -f init &&
240 mkdir sub &&
241 touch sub/added sub/addedtoo &&
242 test_must_fail git checkout top 2>actual &&
243 cat >expected <<\EOF &&
244error: The following untracked working tree files would be overwritten by checkout:
245 sub/added
246 sub/addedtoo
247Please move or remove them before you can switch branches.
Junio C Hamano08ec3b52011-10-13 19:03:18 -0700248Aborting
Nguyễn Thái Ngọc Duy17d26a42011-09-22 21:24:22 +1000249EOF
250 test_cmp expected actual
251'
252
Nguyễn Thái Ngọc Duy08d595d2013-04-13 09:12:08 +1000253test_expect_success 'checkout without --ignore-skip-worktree-bits' '
254 echo "*" >.git/info/sparse-checkout &&
255 git checkout -f top &&
256 test_path_is_file init.t &&
257 echo sub >.git/info/sparse-checkout &&
258 git checkout &&
259 echo modified >> sub/added &&
260 git checkout . &&
261 test_path_is_missing init.t &&
262 git diff --exit-code HEAD
263'
264
265test_expect_success 'checkout with --ignore-skip-worktree-bits' '
266 echo "*" >.git/info/sparse-checkout &&
267 git checkout -f top &&
268 test_path_is_file init.t &&
269 echo sub >.git/info/sparse-checkout &&
270 git checkout &&
271 echo modified >> sub/added &&
272 git checkout --ignore-skip-worktree-bits . &&
273 test_path_is_file init.t &&
274 git diff --exit-code HEAD
275'
276
Nguyễn Thái Ngọc Duyd6b38f62009-08-20 20:47:12 +0700277test_done