t3700: fix broken test under !POSIXPERM
[git/git.git] / t / t3700-add.sh
CommitLineData
60ace879
CW
1#!/bin/sh
2#
3# Copyright (c) 2006 Carl D. Worth
4#
5
5be60078 6test_description='Test of git add, including the -- option.'
60ace879
CW
7
8. ./test-lib.sh
9
766cdc41
IB
10# Test the file mode "$1" of the file "$2" in the index.
11test_mode_in_index () {
12 case "$(git ls-files -s "$2")" in
13 "$1 "*" $2")
14 echo pass
15 ;;
16 *)
17 echo fail
18 git ls-files -s "$2"
19 return 1
20 ;;
21 esac
22}
23
60ace879 24test_expect_success \
5be60078
JH
25 'Test of git add' \
26 'touch foo && git add foo'
60ace879
CW
27
28test_expect_success \
29 'Post-check that foo is in the index' \
5be60078 30 'git ls-files foo | grep foo'
60ace879
CW
31
32test_expect_success \
5be60078
JH
33 'Test that "git add -- -q" works' \
34 'touch -- -q && git add -- -q'
60ace879 35
fd28b34a 36test_expect_success \
5be60078 37 'git add: Test that executable bit is not used if core.filemode=0' \
e0d10e1c 38 'git config core.filemode 0 &&
fd28b34a
SP
39 echo foo >xfoo1 &&
40 chmod 755 xfoo1 &&
5be60078 41 git add xfoo1 &&
766cdc41 42 test_mode_in_index 100644 xfoo1'
fd28b34a 43
889c6f0e 44test_expect_success 'git add: filemode=0 should not get confused by symlink' '
185c975f 45 rm -f xfoo1 &&
889c6f0e 46 test_ln_s_add foo xfoo1 &&
766cdc41 47 test_mode_in_index 120000 xfoo1
185c975f
JH
48'
49
fd28b34a 50test_expect_success \
5be60078 51 'git update-index --add: Test that executable bit is not used...' \
e0d10e1c 52 'git config core.filemode 0 &&
fd28b34a
SP
53 echo foo >xfoo2 &&
54 chmod 755 xfoo2 &&
5be60078 55 git update-index --add xfoo2 &&
766cdc41 56 test_mode_in_index 100644 xfoo2'
2bbaaed9 57
889c6f0e 58test_expect_success 'git add: filemode=0 should not get confused by symlink' '
185c975f 59 rm -f xfoo2 &&
889c6f0e 60 test_ln_s_add foo xfoo2 &&
766cdc41 61 test_mode_in_index 120000 xfoo2
185c975f
JH
62'
63
889c6f0e 64test_expect_success \
5be60078 65 'git update-index --add: Test that executable bit is not used...' \
e0d10e1c 66 'git config core.filemode 0 &&
889c6f0e 67 test_ln_s_add xfoo2 xfoo3 && # runs git update-index --add
766cdc41 68 test_mode_in_index 120000 xfoo3'
fd28b34a 69
4d06f8ac
JH
70test_expect_success '.gitignore test setup' '
71 echo "*.ig" >.gitignore &&
72 mkdir c.if d.ig &&
73 >a.ig && >b.if &&
74 >c.if/c.if && >c.if/c.ig &&
75 >d.ig/d.if && >d.ig/d.ig
76'
77
78test_expect_success '.gitignore is honored' '
5be60078 79 git add . &&
bbf08124 80 ! (git ls-files | grep "\\.ig")
4d06f8ac
JH
81'
82
83test_expect_success 'error out when attempting to add ignored ones without -f' '
d492b31c 84 test_must_fail git add a.?? &&
bbf08124 85 ! (git ls-files | grep "\\.ig")
4d06f8ac
JH
86'
87
88test_expect_success 'error out when attempting to add ignored ones without -f' '
d492b31c 89 test_must_fail git add d.?? &&
bbf08124 90 ! (git ls-files | grep "\\.ig")
4d06f8ac
JH
91'
92
1d31e5a2
MG
93test_expect_success 'error out when attempting to add ignored ones but add others' '
94 touch a.if &&
95 test_must_fail git add a.?? &&
96 ! (git ls-files | grep "\\.ig") &&
97 (git ls-files | grep a.if)
98'
99
4d06f8ac 100test_expect_success 'add ignored ones with -f' '
5be60078
JH
101 git add -f a.?? &&
102 git ls-files --error-unmatch a.ig
4d06f8ac
JH
103'
104
105test_expect_success 'add ignored ones with -f' '
5be60078
JH
106 git add -f d.??/* &&
107 git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
4d06f8ac
JH
108'
109
41a7aa58
JH
110test_expect_success 'add ignored ones with -f' '
111 rm -f .git/index &&
112 git add -f d.?? &&
113 git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
114'
115
116test_expect_success '.gitignore with subdirectory' '
117
118 rm -f .git/index &&
119 mkdir -p sub/dir &&
120 echo "!dir/a.*" >sub/.gitignore &&
121 >sub/a.ig &&
122 >sub/dir/a.ig &&
123 git add sub/dir &&
124 git ls-files --error-unmatch sub/dir/a.ig &&
125 rm -f .git/index &&
126 (
127 cd sub/dir &&
128 git add .
129 ) &&
130 git ls-files --error-unmatch sub/dir/a.ig
131'
132
c7f34c18
JS
133mkdir 1 1/2 1/3
134touch 1/2/a 1/3/b 1/2/c
135test_expect_success 'check correct prefix detection' '
41a7aa58 136 rm -f .git/index &&
c7f34c18
JS
137 git add 1/2/a 1/3/b 1/2/c
138'
139
05dcd698 140test_expect_success 'git add with filemode=0, symlinks=0, and unmerged entries' '
20314271
JS
141 for s in 1 2 3
142 do
05dcd698 143 echo $s > stage$s
20314271 144 echo "100755 $(git hash-object -w stage$s) $s file"
05dcd698 145 echo "120000 $(printf $s | git hash-object -w -t blob --stdin) $s symlink"
20314271
JS
146 done | git update-index --index-info &&
147 git config core.filemode 0 &&
05dcd698 148 git config core.symlinks 0 &&
20314271 149 echo new > file &&
05dcd698
JS
150 echo new > symlink &&
151 git add file symlink &&
152 git ls-files --stage | grep "^100755 .* 0 file$" &&
153 git ls-files --stage | grep "^120000 .* 0 symlink$"
20314271
JS
154'
155
05dcd698
JS
156test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over stage 1' '
157 git rm --cached -f file symlink &&
20314271
JS
158 (
159 echo "100644 $(git hash-object -w stage1) 1 file"
160 echo "100755 $(git hash-object -w stage2) 2 file"
a697ec69
JH
161 echo "100644 $(printf 1 | git hash-object -w -t blob --stdin) 1 symlink"
162 echo "120000 $(printf 2 | git hash-object -w -t blob --stdin) 2 symlink"
20314271
JS
163 ) | git update-index --index-info &&
164 git config core.filemode 0 &&
05dcd698 165 git config core.symlinks 0 &&
20314271 166 echo new > file &&
05dcd698
JS
167 echo new > symlink &&
168 git add file symlink &&
169 git ls-files --stage | grep "^100755 .* 0 file$" &&
170 git ls-files --stage | grep "^120000 .* 0 symlink$"
20314271
JS
171'
172
d616813d
AJ
173test_expect_success 'git add --refresh' '
174 >foo && git add foo && git commit -a -m "commit all" &&
ed6c2314 175 test -z "$(git diff-index HEAD -- foo)" &&
d616813d 176 git read-tree HEAD &&
ed6c2314 177 case "$(git diff-index HEAD -- foo)" in
335f8787 178 :100644" "*"M foo") echo pass;;
d616813d
AJ
179 *) echo fail; (exit 1);;
180 esac &&
181 git add --refresh -- foo &&
ed6c2314 182 test -z "$(git diff-index HEAD -- foo)"
d616813d
AJ
183'
184
3d1f148c
JH
185test_expect_success 'git add --refresh with pathspec' '
186 git reset --hard &&
187 echo >foo && echo >bar && echo >baz &&
188 git add foo bar baz && H=$(git rev-parse :foo) && git rm -f foo &&
189 echo "100644 $H 3 foo" | git update-index --index-info &&
190 test-chmtime -60 bar baz &&
191 >expect &&
192 git add --refresh bar >actual &&
193 test_cmp expect actual &&
194
195 git diff-files --name-only >actual &&
196 ! grep bar actual&&
197 grep baz actual
198'
199
c91cfd19 200test_expect_success POSIXPERM,SANITY 'git add should fail atomically upon an unreadable file' '
89597436
AR
201 git reset --hard &&
202 date >foo1 &&
203 date >foo2 &&
204 chmod 0 foo2 &&
205 test_must_fail git add --verbose . &&
206 ! ( git ls-files foo1 | grep foo1 )
207'
208
209rm -f foo2
210
c91cfd19 211test_expect_success POSIXPERM,SANITY 'git add --ignore-errors' '
89597436
AR
212 git reset --hard &&
213 date >foo1 &&
214 date >foo2 &&
215 chmod 0 foo2 &&
216 test_must_fail git add --verbose --ignore-errors . &&
217 git ls-files foo1 | grep foo1
218'
219
220rm -f foo2
221
c91cfd19 222test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors)' '
dad25e4a
AR
223 git config add.ignore-errors 1 &&
224 git reset --hard &&
225 date >foo1 &&
226 date >foo2 &&
227 chmod 0 foo2 &&
228 test_must_fail git add --verbose . &&
229 git ls-files foo1 | grep foo1
230'
231rm -f foo2
232
c91cfd19 233test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors = false)' '
dad25e4a
AR
234 git config add.ignore-errors 0 &&
235 git reset --hard &&
236 date >foo1 &&
237 date >foo2 &&
238 chmod 0 foo2 &&
239 test_must_fail git add --verbose . &&
240 ! ( git ls-files foo1 | grep foo1 )
241'
ed342fde
SB
242rm -f foo2
243
c91cfd19 244test_expect_success POSIXPERM,SANITY '--no-ignore-errors overrides config' '
ed342fde
SB
245 git config add.ignore-errors 1 &&
246 git reset --hard &&
247 date >foo1 &&
248 date >foo2 &&
249 chmod 0 foo2 &&
250 test_must_fail git add --verbose --no-ignore-errors . &&
251 ! ( git ls-files foo1 | grep foo1 ) &&
252 git config add.ignore-errors 0
253'
254rm -f foo2
dad25e4a 255
6fd1106a 256test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" '
ea335b56 257 git reset --hard &&
8134a003
AR
258 touch fo\[ou\]bar foobar &&
259 git add '\''fo\[ou\]bar'\'' &&
87539416 260 git ls-files fo\[ou\]bar | fgrep fo\[ou\]bar &&
ea335b56
KB
261 ! ( git ls-files foobar | grep foobar )
262'
263
6e4f981f
JK
264test_expect_success 'git add to resolve conflicts on otherwise ignored path' '
265 git reset --hard &&
266 H=$(git rev-parse :1/2/a) &&
267 (
268 echo "100644 $H 1 track-this"
269 echo "100644 $H 3 track-this"
270 ) | git update-index --index-info &&
271 echo track-this >>.gitignore &&
272 echo resolved >track-this &&
273 git add track-this
274'
275
1e7ef746
CP
276test_expect_success '"add non-existent" should fail' '
277 test_must_fail git add non-existent &&
278 ! (git ls-files | grep "non-existent")
279'
280
64ed07ce
NTND
281test_expect_success 'git add -A on empty repo does not error out' '
282 rm -fr empty &&
283 git init empty &&
284 (
285 cd empty &&
286 git add -A . &&
287 git add -A
288 )
289'
290
291test_expect_success '"git add ." in empty repo' '
292 rm -fr empty &&
293 git init empty &&
294 (
295 cd empty &&
296 git add .
297 )
298'
299
108da0db
JL
300test_expect_success 'git add --dry-run of existing changed file' "
301 echo new >>track-this &&
302 git add --dry-run track-this >actual 2>&1 &&
303 echo \"add 'track-this'\" | test_cmp - actual
304"
305
306test_expect_success 'git add --dry-run of non-existing file' "
307 echo ignored-file >>.gitignore &&
48168851
ÆAB
308 test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
309"
310
68b2a005 311test_expect_success 'git add --dry-run of an existing file output' "
48168851 312 echo \"fatal: pathspec 'ignored-file' did not match any files\" >expect &&
68b2a005 313 test_i18ncmp expect actual
108da0db
JL
314"
315
c1e02b2b 316cat >expect.err <<\EOF
108da0db
JL
317The following paths are ignored by one of your .gitignore files:
318ignored-file
319Use -f if you really want to add them.
c1e02b2b
JS
320EOF
321cat >expect.out <<\EOF
108da0db
JL
322add 'track-this'
323EOF
324
325test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '
439fb829
ÆAB
326 test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err
327'
328
68b2a005
JH
329test_expect_success 'git add --dry-run --ignore-missing of non-existing file output' '
330 test_i18ncmp expect.out actual.out &&
331 test_i18ncmp expect.err actual.err
108da0db
JL
332'
333
d426430e
EX
334test_expect_success 'git add empty string should invoke warning' '
335 git add "" 2>output &&
336 test_i18ngrep "warning: empty strings" output
337'
338
b38ab197 339test_expect_success 'git add --chmod=[+-]x stages correctly' '
c0fa44d8 340 rm -f foo1 &&
4e55ed32
ET
341 echo foo >foo1 &&
342 git add --chmod=+x foo1 &&
766cdc41 343 test_mode_in_index 100755 foo1 &&
b38ab197 344 git add --chmod=-x foo1 &&
766cdc41 345 test_mode_in_index 100644 foo1
4e55ed32
ET
346'
347
348test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' '
349 git config core.filemode 1 &&
350 git config core.symlinks 1 &&
c0fa44d8 351 rm -f foo2 &&
4e55ed32
ET
352 echo foo >foo2 &&
353 git add --chmod=+x foo2 &&
766cdc41 354 test_mode_in_index 100755 foo2
4e55ed32
ET
355'
356
610d55af 357test_expect_success 'git add --chmod=[+-]x changes index with already added file' '
76e368c3 358 rm -f foo3 xfoo3 &&
57ea241e 359 git reset --hard &&
610d55af
TG
360 echo foo >foo3 &&
361 git add foo3 &&
362 git add --chmod=+x foo3 &&
363 test_mode_in_index 100755 foo3 &&
364 echo foo >xfoo3 &&
365 chmod 755 xfoo3 &&
366 git add xfoo3 &&
367 git add --chmod=-x xfoo3 &&
368 test_mode_in_index 100644 xfoo3
369'
370
40e0dc17 371test_expect_success POSIXPERM 'git add --chmod=[+-]x does not change the working tree' '
610d55af
TG
372 echo foo >foo4 &&
373 git add foo4 &&
374 git add --chmod=+x foo4 &&
40e0dc17 375 ! test -x foo4
610d55af
TG
376'
377
378test_expect_success 'no file status change if no pathspec is given' '
379 >foo5 &&
380 >foo6 &&
381 git add foo5 foo6 &&
382 git add --chmod=+x &&
383 test_mode_in_index 100644 foo5 &&
384 test_mode_in_index 100644 foo6
385'
386
387test_expect_success 'no file status change if no pathspec is given in subdir' '
b07ad464 388 mkdir -p sub &&
610d55af
TG
389 (
390 cd sub &&
391 >sub-foo1 &&
392 >sub-foo2 &&
393 git add . &&
394 git add --chmod=+x &&
395 test_mode_in_index 100644 sub-foo1 &&
396 test_mode_in_index 100644 sub-foo2
397 )
398'
399
400test_expect_success 'all statuses changed in folder if . is given' '
401 git add --chmod=+x . &&
402 test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 &&
403 git add --chmod=-x . &&
404 test $(git ls-files --stage | grep ^100755 | wc -l) -eq 0
405'
406
60ace879 407test_done