1#!/bin/sh
2#
3# Copyright (c) 2006 Carl D. Worth
4#
5test_description='Test of git add, including the -- option.'
7. ./test-lib.sh
9test_expect_success \
11 'Test of git add' \
12 'touch foo && git add foo'
13test_expect_success \
15 'Post-check that foo is in the index' \
16 'git ls-files foo | grep foo'
17test_expect_success \
19 'Test that "git add -- -q" works' \
20 'touch -- -q && git add -- -q'
21test_expect_success \
23 'git add: Test that executable bit is not used if core.filemode=0' \
24 'git config core.filemode 0 &&
25 echo foo >xfoo1 &&
26 chmod 755 xfoo1 &&
27 git add xfoo1 &&
28 case "`git ls-files --stage xfoo1`" in
29 100644" "*xfoo1) echo ok;;
30 *) echo fail; git ls-files --stage xfoo1; (exit 1);;
31 esac'
32test_expect_success SYMLINKS 'git add: filemode=0 should not get confused by symlink' '
34 rm -f xfoo1 &&
35 ln -s foo xfoo1 &&
36 git add xfoo1 &&
37 case "`git ls-files --stage xfoo1`" in
38 120000" "*xfoo1) echo ok;;
39 *) echo fail; git ls-files --stage xfoo1; (exit 1);;
40 esac
41'
42test_expect_success \
44 'git update-index --add: Test that executable bit is not used...' \
45 'git config core.filemode 0 &&
46 echo foo >xfoo2 &&
47 chmod 755 xfoo2 &&
48 git update-index --add xfoo2 &&
49 case "`git ls-files --stage xfoo2`" in
50 100644" "*xfoo2) echo ok;;
51 *) echo fail; git ls-files --stage xfoo2; (exit 1);;
52 esac'
53test_expect_success SYMLINKS 'git add: filemode=0 should not get confused by symlink' '
55 rm -f xfoo2 &&
56 ln -s foo xfoo2 &&
57 git update-index --add xfoo2 &&
58 case "`git ls-files --stage xfoo2`" in
59 120000" "*xfoo2) echo ok;;
60 *) echo fail; git ls-files --stage xfoo2; (exit 1);;
61 esac
62'
63test_expect_success SYMLINKS \
65 'git update-index --add: Test that executable bit is not used...' \
66 'git config core.filemode 0 &&
67 ln -s xfoo2 xfoo3 &&
68 git update-index --add xfoo3 &&
69 case "`git ls-files --stage xfoo3`" in
70 120000" "*xfoo3) echo ok;;
71 *) echo fail; git ls-files --stage xfoo3; (exit 1);;
72 esac'
73test_expect_success '.gitignore test setup' '
75 echo "*.ig" >.gitignore &&
76 mkdir c.if d.ig &&
77 >a.ig && >b.if &&
78 >c.if/c.if && >c.if/c.ig &&
79 >d.ig/d.if && >d.ig/d.ig
80'
81test_expect_success '.gitignore is honored' '
83 git add . &&
84 ! (git ls-files | grep "\\.ig")
85'
86test_expect_success 'error out when attempting to add ignored ones without -f' '
88 test_must_fail git add a.?? &&
89 ! (git ls-files | grep "\\.ig")
90'
91test_expect_success 'error out when attempting to add ignored ones without -f' '
93 test_must_fail git add d.?? &&
94 ! (git ls-files | grep "\\.ig")
95'
96test_expect_success 'add ignored ones with -f' '
98 git add -f a.?? &&
99 git ls-files --error-unmatch a.ig
100'
101test_expect_success 'add ignored ones with -f' '
103 git add -f d.??/* &&
104 git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
105'
106test_expect_success 'add ignored ones with -f' '
108 rm -f .git/index &&
109 git add -f d.?? &&
110 git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
111'
112test_expect_success '.gitignore with subdirectory' '
114 rm -f .git/index &&
116 mkdir -p sub/dir &&
117 echo "!dir/a.*" >sub/.gitignore &&
118 >sub/a.ig &&
119 >sub/dir/a.ig &&
120 git add sub/dir &&
121 git ls-files --error-unmatch sub/dir/a.ig &&
122 rm -f .git/index &&
123 (
124 cd sub/dir &&
125 git add .
126 ) &&
127 git ls-files --error-unmatch sub/dir/a.ig
128'
129mkdir 1 1/2 1/3
131touch 1/2/a 1/3/b 1/2/c
132test_expect_success 'check correct prefix detection' '
133 rm -f .git/index &&
134 git add 1/2/a 1/3/b 1/2/c
135'
136test_expect_success 'git add with filemode=0, symlinks=0, and unmerged entries' '
138 for s in 1 2 3
139 do
140 echo $s > stage$s
141 echo "100755 $(git hash-object -w stage$s) $s file"
142 echo "120000 $(printf $s | git hash-object -w -t blob --stdin) $s symlink"
143 done | git update-index --index-info &&
144 git config core.filemode 0 &&
145 git config core.symlinks 0 &&
146 echo new > file &&
147 echo new > symlink &&
148 git add file symlink &&
149 git ls-files --stage | grep "^100755 .* 0 file$" &&
150 git ls-files --stage | grep "^120000 .* 0 symlink$"
151'
152test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over stage 1' '
154 git rm --cached -f file symlink &&
155 (
156 echo "100644 $(git hash-object -w stage1) 1 file"
157 echo "100755 $(git hash-object -w stage2) 2 file"
158 echo "100644 $(printf 1 | git hash-object -w -t blob --stdin) 1 symlink"
159 echo "120000 $(printf 2 | git hash-object -w -t blob --stdin) 2 symlink"
160 ) | git update-index --index-info &&
161 git config core.filemode 0 &&
162 git config core.symlinks 0 &&
163 echo new > file &&
164 echo new > symlink &&
165 git add file symlink &&
166 git ls-files --stage | grep "^100755 .* 0 file$" &&
167 git ls-files --stage | grep "^120000 .* 0 symlink$"
168'
169test_expect_success 'git add --refresh' '
171 >foo && git add foo && git commit -a -m "commit all" &&
172 test -z "`git diff-index HEAD -- foo`" &&
173 git read-tree HEAD &&
174 case "`git diff-index HEAD -- foo`" in
175 :100644" "*"M foo") echo ok;;
176 *) echo fail; (exit 1);;
177 esac &&
178 git add --refresh -- foo &&
179 test -z "`git diff-index HEAD -- foo`"
180'
181test_expect_success POSIXPERM 'git add should fail atomically upon an unreadable file' '
183 git reset --hard &&
184 date >foo1 &&
185 date >foo2 &&
186 chmod 0 foo2 &&
187 test_must_fail git add --verbose . &&
188 ! ( git ls-files foo1 | grep foo1 )
189'
190rm -f foo2
192test_expect_success POSIXPERM 'git add --ignore-errors' '
194 git reset --hard &&
195 date >foo1 &&
196 date >foo2 &&
197 chmod 0 foo2 &&
198 test_must_fail git add --verbose --ignore-errors . &&
199 git ls-files foo1 | grep foo1
200'
201rm -f foo2
203test_expect_success POSIXPERM 'git add (add.ignore-errors)' '
205 git config add.ignore-errors 1 &&
206 git reset --hard &&
207 date >foo1 &&
208 date >foo2 &&
209 chmod 0 foo2 &&
210 test_must_fail git add --verbose . &&
211 git ls-files foo1 | grep foo1
212'
213rm -f foo2
214test_expect_success POSIXPERM 'git add (add.ignore-errors = false)' '
216 git config add.ignore-errors 0 &&
217 git reset --hard &&
218 date >foo1 &&
219 date >foo2 &&
220 chmod 0 foo2 &&
221 test_must_fail git add --verbose . &&
222 ! ( git ls-files foo1 | grep foo1 )
223'
224rm -f foo2
225test_expect_success POSIXPERM '--no-ignore-errors overrides config' '
227 git config add.ignore-errors 1 &&
228 git reset --hard &&
229 date >foo1 &&
230 date >foo2 &&
231 chmod 0 foo2 &&
232 test_must_fail git add --verbose --no-ignore-errors . &&
233 ! ( git ls-files foo1 | grep foo1 ) &&
234 git config add.ignore-errors 0
235'
236rm -f foo2
237test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" '
239 git reset --hard &&
240 touch fo\[ou\]bar foobar &&
241 git add '\''fo\[ou\]bar'\'' &&
242 git ls-files fo\[ou\]bar | fgrep fo\[ou\]bar &&
243 ! ( git ls-files foobar | grep foobar )
244'
245test_expect_success 'git add to resolve conflicts on otherwise ignored path' '
247 git reset --hard &&
248 H=$(git rev-parse :1/2/a) &&
249 (
250 echo "100644 $H 1 track-this"
251 echo "100644 $H 3 track-this"
252 ) | git update-index --index-info &&
253 echo track-this >>.gitignore &&
254 echo resolved >track-this &&
255 git add track-this
256'
257test_done