Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 3 | test_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 Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 13 | |
| 14 | . ./test-lib.sh |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 15 | . "$TEST_DIRECTORY"/lib-read-tree.sh |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 16 | |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 17 | test_expect_success 'setup' ' |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 18 | cat >expected <<-\EOF && |
| 19 | 100644 77f0ba1734ed79d12881f81b36ee134de6a3327b 0 init.t |
| 20 | 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 sub/added |
Nguyễn Thái Ngọc Duy | d61ebbe | 2011-05-02 19:47:43 +0700 | [diff] [blame] | 21 | 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 sub/addedtoo |
Nguyễn Thái Ngọc Duy | ae3cdfe | 2010-11-08 01:04:58 +0700 | [diff] [blame] | 22 | 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 subsub/added |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 23 | EOF |
| 24 | cat >expected.swt <<-\EOF && |
| 25 | H init.t |
| 26 | H sub/added |
Nguyễn Thái Ngọc Duy | d61ebbe | 2011-05-02 19:47:43 +0700 | [diff] [blame] | 27 | H sub/addedtoo |
Nguyễn Thái Ngọc Duy | ae3cdfe | 2010-11-08 01:04:58 +0700 | [diff] [blame] | 28 | H subsub/added |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 29 | EOF |
| 30 | |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 31 | test_commit init && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 32 | echo modified >>init.t && |
Nguyễn Thái Ngọc Duy | ae3cdfe | 2010-11-08 01:04:58 +0700 | [diff] [blame] | 33 | mkdir sub subsub && |
Nguyễn Thái Ngọc Duy | d61ebbe | 2011-05-02 19:47:43 +0700 | [diff] [blame] | 34 | touch sub/added sub/addedtoo subsub/added && |
| 35 | git add init.t sub/added sub/addedtoo subsub/added && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 36 | 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 Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 42 | git ls-files --stage >result && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 43 | test_cmp expected result |
| 44 | ' |
| 45 | |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 46 | test_expect_success 'read-tree without .git/info/sparse-checkout' ' |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 47 | read_tree_u_must_succeed -m -u HEAD && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 48 | git ls-files --stage >result && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 49 | test_cmp expected result && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 50 | git ls-files -t >result && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 51 | test_cmp expected.swt result |
| 52 | ' |
| 53 | |
| 54 | test_expect_success 'read-tree with .git/info/sparse-checkout but disabled' ' |
Jonathan Nieder | a48fcd8 | 2010-10-30 20:46:54 -0500 | [diff] [blame] | 55 | echo >.git/info/sparse-checkout && |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 56 | read_tree_u_must_succeed -m -u HEAD && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 57 | git ls-files -t >result && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 58 | test_cmp expected.swt result && |
| 59 | test -f init.t && |
| 60 | test -f sub/added |
| 61 | ' |
| 62 | |
| 63 | test_expect_success 'read-tree --no-sparse-checkout with empty .git/info/sparse-checkout and enabled' ' |
| 64 | git config core.sparsecheckout true && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 65 | echo >.git/info/sparse-checkout && |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 66 | read_tree_u_must_succeed --no-sparse-checkout -m -u HEAD && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 67 | git ls-files -t >result && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 68 | test_cmp expected.swt result && |
| 69 | test -f init.t && |
| 70 | test -f sub/added |
| 71 | ' |
| 72 | |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 73 | test_expect_success 'read-tree with empty .git/info/sparse-checkout' ' |
| 74 | git config core.sparsecheckout true && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 75 | echo >.git/info/sparse-checkout && |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 76 | read_tree_u_must_fail -m -u HEAD && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 77 | git ls-files --stage >result && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 78 | test_cmp expected result && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 79 | git ls-files -t >result && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 80 | test_cmp expected.swt result && |
Nguyễn Thái Ngọc Duy | 9e1afb1 | 2009-08-20 20:47:13 +0700 | [diff] [blame] | 81 | test -f init.t && |
| 82 | test -f sub/added |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 83 | ' |
| 84 | |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 85 | test_expect_success 'match directories with trailing slash' ' |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 86 | cat >expected.swt-noinit <<-\EOF && |
| 87 | S init.t |
| 88 | H sub/added |
Nguyễn Thái Ngọc Duy | d61ebbe | 2011-05-02 19:47:43 +0700 | [diff] [blame] | 89 | H sub/addedtoo |
Nguyễn Thái Ngọc Duy | ae3cdfe | 2010-11-08 01:04:58 +0700 | [diff] [blame] | 90 | S subsub/added |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 91 | EOF |
| 92 | |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 93 | echo sub/ > .git/info/sparse-checkout && |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 94 | read_tree_u_must_succeed -m -u HEAD && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 95 | git ls-files -t > result && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 96 | test_cmp expected.swt-noinit result && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 97 | test ! -f init.t && |
| 98 | test -f sub/added |
| 99 | ' |
| 100 | |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 101 | test_expect_success 'match directories without trailing slash' ' |
Nguyễn Thái Ngọc Duy | d61ebbe | 2011-05-02 19:47:43 +0700 | [diff] [blame] | 102 | echo sub >.git/info/sparse-checkout && |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 103 | read_tree_u_must_succeed -m -u HEAD && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 104 | git ls-files -t >result && |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 105 | test_cmp expected.swt-noinit result && |
| 106 | test ! -f init.t && |
| 107 | test -f sub/added |
| 108 | ' |
| 109 | |
Nguyễn Thái Ngọc Duy | 2891109 | 2011-05-09 22:43:01 +0700 | [diff] [blame] | 110 | test_expect_success 'match directories with negated patterns' ' |
| 111 | cat >expected.swt-negation <<\EOF && |
| 112 | S init.t |
| 113 | S sub/added |
| 114 | H sub/addedtoo |
| 115 | S subsub/added |
| 116 | EOF |
| 117 | |
| 118 | cat >.git/info/sparse-checkout <<\EOF && |
| 119 | sub |
| 120 | !sub/added |
| 121 | EOF |
| 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 | |
| 130 | test_expect_success 'match directories with negated patterns (2)' ' |
| 131 | cat >expected.swt-negation2 <<\EOF && |
| 132 | H init.t |
| 133 | H sub/added |
| 134 | S sub/addedtoo |
| 135 | H subsub/added |
| 136 | EOF |
| 137 | |
| 138 | cat >.git/info/sparse-checkout <<\EOF && |
| 139 | /* |
| 140 | !sub |
| 141 | sub/added |
| 142 | EOF |
| 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 Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 151 | test_expect_success 'match directory pattern' ' |
Nguyễn Thái Ngọc Duy | d61ebbe | 2011-05-02 19:47:43 +0700 | [diff] [blame] | 152 | echo "s?b" >.git/info/sparse-checkout && |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 153 | read_tree_u_must_succeed -m -u HEAD && |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 154 | git ls-files -t >result && |
| 155 | test_cmp expected.swt-noinit result && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 156 | test ! -f init.t && |
| 157 | test -f sub/added |
| 158 | ' |
| 159 | |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 160 | test_expect_success 'checkout area changes' ' |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 161 | cat >expected.swt-nosub <<-\EOF && |
| 162 | H init.t |
| 163 | S sub/added |
Nguyễn Thái Ngọc Duy | d61ebbe | 2011-05-02 19:47:43 +0700 | [diff] [blame] | 164 | S sub/addedtoo |
Nguyễn Thái Ngọc Duy | ae3cdfe | 2010-11-08 01:04:58 +0700 | [diff] [blame] | 165 | S subsub/added |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 166 | EOF |
| 167 | |
| 168 | echo init.t >.git/info/sparse-checkout && |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 169 | read_tree_u_must_succeed -m -u HEAD && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 170 | git ls-files -t >result && |
| 171 | test_cmp expected.swt-nosub result && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 172 | test -f init.t && |
| 173 | test ! -f sub/added |
| 174 | ' |
| 175 | |
| 176 | test_expect_success 'read-tree updates worktree, absent case' ' |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 177 | echo sub/added >.git/info/sparse-checkout && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 178 | git checkout -f top && |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 179 | read_tree_u_must_succeed -m -u HEAD^ && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 180 | test ! -f init.t |
| 181 | ' |
| 182 | |
| 183 | test_expect_success 'read-tree updates worktree, dirty case' ' |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 184 | echo sub/added >.git/info/sparse-checkout && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 185 | git checkout -f top && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 186 | echo dirty >init.t && |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 187 | read_tree_u_must_succeed -m -u HEAD^ && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 188 | grep -q dirty init.t && |
| 189 | rm init.t |
| 190 | ' |
| 191 | |
| 192 | test_expect_success 'read-tree removes worktree, dirty case' ' |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 193 | echo init.t >.git/info/sparse-checkout && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 194 | git checkout -f top && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 195 | echo dirty >added && |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 196 | read_tree_u_must_succeed -m -u HEAD^ && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 197 | grep -q dirty added |
| 198 | ' |
| 199 | |
| 200 | test_expect_success 'read-tree adds to worktree, absent case' ' |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 201 | echo init.t >.git/info/sparse-checkout && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 202 | git checkout -f removed && |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 203 | read_tree_u_must_succeed -u -m HEAD^ && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 204 | test ! -f sub/added |
| 205 | ' |
| 206 | |
Nguyễn Thái Ngọc Duy | 74da98f | 2010-07-31 13:14:29 +0700 | [diff] [blame] | 207 | test_expect_success 'read-tree adds to worktree, dirty case' ' |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 208 | echo init.t >.git/info/sparse-checkout && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 209 | git checkout -f removed && |
| 210 | mkdir sub && |
Jonathan Nieder | 7f71a6a | 2010-07-31 13:14:25 +0700 | [diff] [blame] | 211 | echo dirty >sub/added && |
Jens Lehmann | ea5070c | 2011-05-25 22:10:41 +0200 | [diff] [blame] | 212 | read_tree_u_must_succeed -u -m HEAD^ && |
Nguyễn Thái Ngọc Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 213 | grep -q dirty sub/added |
| 214 | ' |
| 215 | |
Nguyễn Thái Ngọc Duy | eec3fc0 | 2010-07-31 13:14:26 +0700 | [diff] [blame] | 216 | test_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 Duy | 700e66d | 2010-07-31 13:14:27 +0700 | [diff] [blame] | 228 | test_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 Duy | 17d26a4 | 2011-09-22 21:24:22 +1000 | [diff] [blame] | 237 | test_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 && |
| 244 | error: The following untracked working tree files would be overwritten by checkout: |
| 245 | sub/added |
| 246 | sub/addedtoo |
| 247 | Please move or remove them before you can switch branches. |
Junio C Hamano | 08ec3b5 | 2011-10-13 19:03:18 -0700 | [diff] [blame] | 248 | Aborting |
Nguyễn Thái Ngọc Duy | 17d26a4 | 2011-09-22 21:24:22 +1000 | [diff] [blame] | 249 | EOF |
| 250 | test_cmp expected actual |
| 251 | ' |
| 252 | |
Nguyễn Thái Ngọc Duy | 08d595d | 2013-04-13 09:12:08 +1000 | [diff] [blame] | 253 | test_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 | |
| 265 | test_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 Duy | d6b38f6 | 2009-08-20 20:47:12 +0700 | [diff] [blame] | 277 | test_done |