3 test_description
='git add in sparse checked out working trees'
9 # Optionally take a printf format string to write to the sparse_entry file
10 setup_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
&&
16 printf "$1" >sparse_entry
20 git add sparse_entry
&&
21 git update-index
--skip-worktree sparse_entry
&&
22 git commit
--allow-empty -m "ensure sparse_entry exists at HEAD" &&
23 SPARSE_ENTRY_BLOB
=$
(git rev-parse
:sparse_entry
)
26 test_sparse_entry_unchanged
() {
27 echo "100644 $SPARSE_ENTRY_BLOB 0 sparse_entry" >expected
&&
28 git ls-files
--stage sparse_entry
>actual
&&
29 test_cmp expected actual
33 test_when_finished
rm -f .gitignore
&&
34 cat >.gitignore
<<-EOF
40 test_sparse_entry_unstaged
() {
41 git
diff --staged -- sparse_entry
>diff &&
42 test_must_be_empty
diff
45 test_expect_success
'setup' "
46 cat >sparse_error_header <<-EOF &&
47 The following paths and/or pathspecs matched paths that exist
48 outside of your sparse-checkout definition, so will not be
52 cat >sparse_hint <<-EOF &&
53 hint: If you intend to update such entries, try one of the following:
54 hint: * Use the --sparse option.
55 hint: * Disable or modify the sparsity rules.
56 hint: Disable this message with \"git config advice.updateSparsePath false\"
59 echo sparse_entry | cat sparse_error_header - >sparse_entry_error &&
60 cat sparse_entry_error sparse_hint >error_and_hint
63 test_expect_success
'git add does not remove sparse entries' '
66 test_must_fail git add sparse_entry 2>stderr &&
67 test_sparse_entry_unstaged &&
68 test_cmp error_and_hint stderr &&
69 test_sparse_entry_unchanged
72 test_expect_success
'git add -A does not remove sparse entries' '
76 git add -A 2>stderr &&
77 test_must_be_empty stderr &&
78 test_sparse_entry_unchanged
81 test_expect_success
'git add . does not remove sparse entries' '
85 test_must_fail git add . 2>stderr &&
86 test_sparse_entry_unstaged &&
88 cat sparse_error_header >expect &&
90 cat sparse_hint >>expect &&
92 test_cmp expect stderr &&
93 test_sparse_entry_unchanged
96 for opt
in "" -f -u --ignore-removal --dry-run
98 test_expect_success
"git add${opt:+ $opt} does not update sparse entries" '
100 echo modified >sparse_entry &&
101 test_must_fail git add $opt sparse_entry 2>stderr &&
102 test_sparse_entry_unstaged &&
103 test_cmp error_and_hint stderr &&
104 test_sparse_entry_unchanged
108 test_expect_success
'git add --refresh does not update sparse entries' '
109 setup_sparse_entry &&
110 git ls-files --debug sparse_entry | grep mtime >before &&
111 test-tool chmtime -60 sparse_entry &&
112 test_must_fail git add --refresh sparse_entry 2>stderr &&
113 test_sparse_entry_unstaged &&
114 test_cmp error_and_hint stderr &&
115 git ls-files --debug sparse_entry | grep mtime >after &&
116 test_cmp before after
119 test_expect_success
'git add --chmod does not update sparse entries' '
120 setup_sparse_entry &&
121 test_must_fail git add --chmod=+x sparse_entry 2>stderr &&
122 test_sparse_entry_unstaged &&
123 test_cmp error_and_hint stderr &&
124 test_sparse_entry_unchanged &&
125 ! test -x sparse_entry
128 test_expect_success
'git add --renormalize does not update sparse entries' '
129 test_config core.autocrlf false &&
130 setup_sparse_entry "LINEONE\r\nLINETWO\r\n" &&
131 echo "sparse_entry text=auto" >.gitattributes &&
132 test_must_fail git add --renormalize sparse_entry 2>stderr &&
133 test_sparse_entry_unstaged &&
134 test_cmp error_and_hint stderr &&
135 test_sparse_entry_unchanged
138 test_expect_success
'git add --dry-run --ignore-missing warn on sparse path' '
139 setup_sparse_entry &&
141 test_must_fail git add --dry-run --ignore-missing sparse_entry 2>stderr &&
142 test_sparse_entry_unstaged &&
143 test_cmp error_and_hint stderr &&
144 test_sparse_entry_unchanged
147 test_expect_success
'do not advice about sparse entries when they do not match the pathspec' '
148 setup_sparse_entry &&
149 test_must_fail git add nonexistent 2>stderr &&
150 grep "fatal: pathspec .nonexistent. did not match any files" stderr &&
151 ! grep -F -f sparse_error_header stderr
154 test_expect_success
'do not warn when pathspec matches dense entries' '
155 setup_sparse_entry &&
156 echo modified >sparse_entry &&
158 git add "*_entry" 2>stderr &&
159 test_must_be_empty stderr &&
160 test_sparse_entry_unchanged &&
161 git ls-files --error-unmatch dense_entry
164 test_expect_success
'git add fails outside of sparse-checkout definition' '
165 test_when_finished git sparse-checkout disable &&
167 git sparse-checkout init &&
168 git sparse-checkout set a &&
169 echo >>sparse_entry &&
171 git update-index --no-skip-worktree sparse_entry &&
172 test_must_fail git add sparse_entry &&
173 test_sparse_entry_unstaged &&
175 test_must_fail git add --chmod=+x sparse_entry &&
176 test_sparse_entry_unstaged &&
178 test_must_fail git add --renormalize sparse_entry &&
179 test_sparse_entry_unstaged &&
181 # Avoid munging CRLFs to avoid an error message
182 git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
183 test_must_be_empty stderr &&
184 git ls-files --stage >actual &&
185 grep "^100644 .*sparse_entry\$" actual &&
187 git add --sparse --chmod=+x sparse_entry 2>stderr &&
188 test_must_be_empty stderr &&
189 git ls-files --stage >actual &&
190 grep "^100755 .*sparse_entry\$" actual &&
194 # This will print a message over stderr on Windows.
195 git add --sparse --renormalize sparse_entry &&
196 git status --porcelain >actual &&
197 grep "^M sparse_entry\$" actual
200 test_expect_success
'add obeys advice.updateSparsePath' '
201 setup_sparse_entry &&
202 test_must_fail git -c advice.updateSparsePath=false add sparse_entry 2>stderr &&
203 test_sparse_entry_unstaged &&
204 test_cmp sparse_entry_error stderr
208 test_expect_success
'add allows sparse entries with --sparse' '
209 git sparse-checkout set a &&
210 echo modified >sparse_entry &&
211 test_must_fail git add sparse_entry &&
212 test_sparse_entry_unchanged &&
213 git add --sparse sparse_entry 2>stderr &&
214 test_must_be_empty stderr
217 test_expect_success
'can add files from non-sparse dir' '
218 git sparse-checkout set w !/x y/ &&
221 git add w/f x/y/f 2>stderr &&
222 test_must_be_empty stderr
225 test_expect_success
'refuse to add non-skip-worktree file from sparse dir' '
226 git sparse-checkout set !/x y/ !x/y/z &&
229 test_must_fail git add x/y/z/f 2>stderr &&
230 echo x/y/z/f | cat sparse_error_header - sparse_hint >expect &&
231 test_cmp expect stderr