blob: 2bade9e804fcfc74df7d5629bbd409fda1c4a302 [file] [log] [blame]
Matheus Tavares6594afc2021-04-08 17:41:23 -03001#!/bin/sh
2
3test_description='git add in sparse checked out working trees'
4
5. ./test-lib.sh
6
7SPARSE_ENTRY_BLOB=""
8
9# Optionally take a printf format string to write to the sparse_entry file
10setup_sparse_entry () {
11 # 'sparse_entry' might already be in the index with the skip-worktree
12 # bit set. Remove it so that the subsequent git add can update it.
13 git update-index --force-remove sparse_entry &&
14 if test $# -eq 1
15 then
16 printf "$1" >sparse_entry
17 else
18 >sparse_entry
19 fi &&
20 git add sparse_entry &&
21 git update-index --skip-worktree sparse_entry &&
Elijah Newrenaf6a5182022-01-14 15:59:41 +000022 git config core.sparseCheckout false &&
Derrick Stoleeca267ae2021-09-24 15:39:02 +000023 git commit --allow-empty -m "ensure sparse_entry exists at HEAD" &&
Matheus Tavares6594afc2021-04-08 17:41:23 -030024 SPARSE_ENTRY_BLOB=$(git rev-parse :sparse_entry)
25}
26
27test_sparse_entry_unchanged () {
28 echo "100644 $SPARSE_ENTRY_BLOB 0 sparse_entry" >expected &&
29 git ls-files --stage sparse_entry >actual &&
30 test_cmp expected actual
31}
32
33setup_gitignore () {
34 test_when_finished rm -f .gitignore &&
35 cat >.gitignore <<-EOF
36 *
37 !/sparse_entry
38 EOF
39}
40
Derrick Stoleeca267ae2021-09-24 15:39:02 +000041test_sparse_entry_unstaged () {
42 git diff --staged -- sparse_entry >diff &&
43 test_must_be_empty diff
44}
45
Matheus Tavaresa20f7042021-04-08 17:41:27 -030046test_expect_success 'setup' "
47 cat >sparse_error_header <<-EOF &&
Derrick Stolee6579e782021-09-24 15:39:14 +000048 The following paths and/or pathspecs matched paths that exist
49 outside of your sparse-checkout definition, so will not be
50 updated in the index:
Matheus Tavaresa20f7042021-04-08 17:41:27 -030051 EOF
52
53 cat >sparse_hint <<-EOF &&
Derrick Stolee6579e782021-09-24 15:39:14 +000054 hint: If you intend to update such entries, try one of the following:
55 hint: * Use the --sparse option.
56 hint: * Disable or modify the sparsity rules.
Matheus Tavaresa20f7042021-04-08 17:41:27 -030057 hint: Disable this message with \"git config advice.updateSparsePath false\"
58 EOF
59
60 echo sparse_entry | cat sparse_error_header - >sparse_entry_error &&
61 cat sparse_entry_error sparse_hint >error_and_hint
62"
63
Matheus Tavares6594afc2021-04-08 17:41:23 -030064test_expect_success 'git add does not remove sparse entries' '
65 setup_sparse_entry &&
66 rm sparse_entry &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -030067 test_must_fail git add sparse_entry 2>stderr &&
Derrick Stoleeca267ae2021-09-24 15:39:02 +000068 test_sparse_entry_unstaged &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -030069 test_cmp error_and_hint stderr &&
Matheus Tavares6594afc2021-04-08 17:41:23 -030070 test_sparse_entry_unchanged
71'
72
73test_expect_success 'git add -A does not remove sparse entries' '
74 setup_sparse_entry &&
75 rm sparse_entry &&
76 setup_gitignore &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -030077 git add -A 2>stderr &&
78 test_must_be_empty stderr &&
Matheus Tavares6594afc2021-04-08 17:41:23 -030079 test_sparse_entry_unchanged
80'
81
82test_expect_success 'git add . does not remove sparse entries' '
83 setup_sparse_entry &&
84 rm sparse_entry &&
85 setup_gitignore &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -030086 test_must_fail git add . 2>stderr &&
Derrick Stoleeca267ae2021-09-24 15:39:02 +000087 test_sparse_entry_unstaged &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -030088
89 cat sparse_error_header >expect &&
90 echo . >>expect &&
91 cat sparse_hint >>expect &&
92
93 test_cmp expect stderr &&
Matheus Tavares6594afc2021-04-08 17:41:23 -030094 test_sparse_entry_unchanged
95'
96
97for opt in "" -f -u --ignore-removal --dry-run
98do
99 test_expect_success "git add${opt:+ $opt} does not update sparse entries" '
100 setup_sparse_entry &&
101 echo modified >sparse_entry &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -0300102 test_must_fail git add $opt sparse_entry 2>stderr &&
Derrick Stoleeca267ae2021-09-24 15:39:02 +0000103 test_sparse_entry_unstaged &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -0300104 test_cmp error_and_hint stderr &&
Matheus Tavares6594afc2021-04-08 17:41:23 -0300105 test_sparse_entry_unchanged
106 '
107done
108
109test_expect_success 'git add --refresh does not update sparse entries' '
110 setup_sparse_entry &&
111 git ls-files --debug sparse_entry | grep mtime >before &&
112 test-tool chmtime -60 sparse_entry &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -0300113 test_must_fail git add --refresh sparse_entry 2>stderr &&
Derrick Stoleeca267ae2021-09-24 15:39:02 +0000114 test_sparse_entry_unstaged &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -0300115 test_cmp error_and_hint stderr &&
Matheus Tavares6594afc2021-04-08 17:41:23 -0300116 git ls-files --debug sparse_entry | grep mtime >after &&
117 test_cmp before after
118'
119
Matheus Tavaresd73dbaf2021-04-08 17:41:24 -0300120test_expect_success 'git add --chmod does not update sparse entries' '
Matheus Tavares6594afc2021-04-08 17:41:23 -0300121 setup_sparse_entry &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -0300122 test_must_fail git add --chmod=+x sparse_entry 2>stderr &&
Derrick Stoleeca267ae2021-09-24 15:39:02 +0000123 test_sparse_entry_unstaged &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -0300124 test_cmp error_and_hint stderr &&
Matheus Tavares6594afc2021-04-08 17:41:23 -0300125 test_sparse_entry_unchanged &&
126 ! test -x sparse_entry
127'
128
Matheus Tavaresd73dbaf2021-04-08 17:41:24 -0300129test_expect_success 'git add --renormalize does not update sparse entries' '
Elijah Newrenaf6a5182022-01-14 15:59:41 +0000130 test_when_finished rm .gitattributes &&
Matheus Tavares6594afc2021-04-08 17:41:23 -0300131 test_config core.autocrlf false &&
132 setup_sparse_entry "LINEONE\r\nLINETWO\r\n" &&
133 echo "sparse_entry text=auto" >.gitattributes &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -0300134 test_must_fail git add --renormalize sparse_entry 2>stderr &&
Derrick Stoleeca267ae2021-09-24 15:39:02 +0000135 test_sparse_entry_unstaged &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -0300136 test_cmp error_and_hint stderr &&
Matheus Tavares6594afc2021-04-08 17:41:23 -0300137 test_sparse_entry_unchanged
138'
139
Matheus Tavaresa20f7042021-04-08 17:41:27 -0300140test_expect_success 'git add --dry-run --ignore-missing warn on sparse path' '
141 setup_sparse_entry &&
142 rm sparse_entry &&
143 test_must_fail git add --dry-run --ignore-missing sparse_entry 2>stderr &&
Derrick Stoleeca267ae2021-09-24 15:39:02 +0000144 test_sparse_entry_unstaged &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -0300145 test_cmp error_and_hint stderr &&
146 test_sparse_entry_unchanged
147'
148
149test_expect_success 'do not advice about sparse entries when they do not match the pathspec' '
150 setup_sparse_entry &&
151 test_must_fail git add nonexistent 2>stderr &&
152 grep "fatal: pathspec .nonexistent. did not match any files" stderr &&
153 ! grep -F -f sparse_error_header stderr
154'
155
156test_expect_success 'do not warn when pathspec matches dense entries' '
157 setup_sparse_entry &&
158 echo modified >sparse_entry &&
159 >dense_entry &&
160 git add "*_entry" 2>stderr &&
161 test_must_be_empty stderr &&
162 test_sparse_entry_unchanged &&
163 git ls-files --error-unmatch dense_entry
164'
165
Derrick Stolee49fdd512021-09-24 15:39:07 +0000166test_expect_success 'git add fails outside of sparse-checkout definition' '
167 test_when_finished git sparse-checkout disable &&
168 test_commit a &&
Elijah Newrendde13582022-04-22 02:32:18 +0000169 git sparse-checkout init --no-cone &&
Derrick Stolee49fdd512021-09-24 15:39:07 +0000170 git sparse-checkout set a &&
171 echo >>sparse_entry &&
172
173 git update-index --no-skip-worktree sparse_entry &&
174 test_must_fail git add sparse_entry &&
Derrick Stolee0299a692021-09-24 15:39:08 +0000175 test_sparse_entry_unstaged &&
176
Derrick Stolee63b60b32021-09-24 15:39:09 +0000177 test_must_fail git add --chmod=+x sparse_entry &&
178 test_sparse_entry_unstaged &&
179
Derrick Stolee61d450f2021-09-24 15:39:10 +0000180 test_must_fail git add --renormalize sparse_entry &&
181 test_sparse_entry_unstaged &&
182
Derrick Stolee0299a692021-09-24 15:39:08 +0000183 # Avoid munging CRLFs to avoid an error message
184 git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
185 test_must_be_empty stderr &&
Derrick Stoleec2a29402021-12-22 14:20:55 +0000186 git ls-files --stage >actual &&
187 grep "^100644 .*sparse_entry\$" actual &&
Derrick Stolee63b60b32021-09-24 15:39:09 +0000188
189 git add --sparse --chmod=+x sparse_entry 2>stderr &&
190 test_must_be_empty stderr &&
Derrick Stoleec2a29402021-12-22 14:20:55 +0000191 git ls-files --stage >actual &&
192 grep "^100755 .*sparse_entry\$" actual &&
Derrick Stolee61d450f2021-09-24 15:39:10 +0000193
194 git reset &&
195
196 # This will print a message over stderr on Windows.
197 git add --sparse --renormalize sparse_entry &&
198 git status --porcelain >actual &&
199 grep "^M sparse_entry\$" actual
Derrick Stolee49fdd512021-09-24 15:39:07 +0000200'
201
Matheus Tavaresa20f7042021-04-08 17:41:27 -0300202test_expect_success 'add obeys advice.updateSparsePath' '
203 setup_sparse_entry &&
204 test_must_fail git -c advice.updateSparsePath=false add sparse_entry 2>stderr &&
Derrick Stoleeca267ae2021-09-24 15:39:02 +0000205 test_sparse_entry_unstaged &&
Matheus Tavaresa20f7042021-04-08 17:41:27 -0300206 test_cmp sparse_entry_error stderr
207
208'
209
Derrick Stolee0299a692021-09-24 15:39:08 +0000210test_expect_success 'add allows sparse entries with --sparse' '
Elijah Newrendde13582022-04-22 02:32:18 +0000211 git sparse-checkout set --no-cone a &&
Derrick Stolee0299a692021-09-24 15:39:08 +0000212 echo modified >sparse_entry &&
213 test_must_fail git add sparse_entry &&
214 test_sparse_entry_unchanged &&
215 git add --sparse sparse_entry 2>stderr &&
216 test_must_be_empty stderr
217'
218
Matheus Tavares20141e32021-10-28 11:21:11 -0300219test_expect_success 'can add files from non-sparse dir' '
220 git sparse-checkout set w !/x y/ &&
221 mkdir -p w x/y &&
222 touch w/f x/y/f &&
223 git add w/f x/y/f 2>stderr &&
224 test_must_be_empty stderr
225'
226
227test_expect_success 'refuse to add non-skip-worktree file from sparse dir' '
228 git sparse-checkout set !/x y/ !x/y/z &&
229 mkdir -p x/y/z &&
230 touch x/y/z/f &&
231 test_must_fail git add x/y/z/f 2>stderr &&
232 echo x/y/z/f | cat sparse_error_header - sparse_hint >expect &&
233 test_cmp expect stderr
234'
235
Matheus Tavares6594afc2021-04-08 17:41:23 -0300236test_done