3 test_description
='git status for submodule'
7 test_create_repo_with_commit
() {
8 test_create_repo
"$1" &&
13 git commit
-m " Add bar" &&
16 git commit
-m " Add foo"
21 sed -e "s/$OID_REGEX/HASH/" -e "s/$OID_REGEX/HASH/" output
>output2
&&
26 test_expect_success
'setup' '
27 test_create_repo_with_commit sub &&
28 echo output > .gitignore &&
29 git add sub .gitignore &&
30 git commit -m "Add submodule sub"
33 test_expect_success
'status clean' '
35 test_i18ngrep "nothing to commit" output
38 test_expect_success
'commit --dry-run -a clean' '
39 test_must_fail git commit --dry-run -a >output &&
40 test_i18ngrep "nothing to commit" output
43 test_expect_success
'status with modified file in submodule' '
44 (cd sub && git reset --hard) &&
45 echo "changed" >sub/foo &&
47 test_i18ngrep "modified: sub (modified content)" output
50 test_expect_success
'status with modified file in submodule (porcelain)' '
51 (cd sub && git reset --hard) &&
52 echo "changed" >sub/foo &&
53 git status --porcelain >output &&
59 test_expect_success
'status with modified file in submodule (short)' '
60 (cd sub && git reset --hard) &&
61 echo "changed" >sub/foo &&
62 git status --short >output &&
68 test_expect_success
'status with added file in submodule' '
69 (cd sub && git reset --hard && echo >foo && git add foo) &&
71 test_i18ngrep "modified: sub (modified content)" output
74 test_expect_success
'status with added file in submodule (porcelain)' '
75 (cd sub && git reset --hard && echo >foo && git add foo) &&
76 git status --porcelain >output &&
82 test_expect_success
'status with added file in submodule (short)' '
83 (cd sub && git reset --hard && echo >foo && git add foo) &&
84 git status --short >output &&
90 test_expect_success
'status with untracked file in submodule' '
91 (cd sub && git reset --hard) &&
92 echo "content" >sub/new-file &&
94 test_i18ngrep "modified: sub (untracked content)" output
97 test_expect_success
'status -uno with untracked file in submodule' '
98 git status -uno >output &&
99 test_i18ngrep "^nothing to commit" output
102 test_expect_success
'status with untracked file in submodule (porcelain)' '
103 git status --porcelain >output &&
104 diff output - <<-\EOF
109 test_expect_success
'status with untracked file in submodule (short)' '
110 git status --short >output &&
111 diff output - <<-\EOF
116 test_expect_success
'status with added and untracked file in submodule' '
117 (cd sub && git reset --hard && echo >foo && git add foo) &&
118 echo "content" >sub/new-file &&
119 git status >output &&
120 test_i18ngrep "modified: sub (modified content, untracked content)" output
123 test_expect_success
'status with added and untracked file in submodule (porcelain)' '
124 (cd sub && git reset --hard && echo >foo && git add foo) &&
125 echo "content" >sub/new-file &&
126 git status --porcelain >output &&
127 diff output - <<-\EOF
132 test_expect_success
'status with modified file in modified submodule' '
133 (cd sub && git reset --hard) &&
135 (cd sub && echo "next change" >foo && git commit -m "next change" foo) &&
136 echo "changed" >sub/foo &&
137 git status >output &&
138 test_i18ngrep "modified: sub (new commits, modified content)" output
141 test_expect_success
'status with modified file in modified submodule (porcelain)' '
142 (cd sub && git reset --hard) &&
143 echo "changed" >sub/foo &&
144 git status --porcelain >output &&
145 diff output - <<-\EOF
150 test_expect_success
'status with added file in modified submodule' '
151 (cd sub && git reset --hard && echo >foo && git add foo) &&
152 git status >output &&
153 test_i18ngrep "modified: sub (new commits, modified content)" output
156 test_expect_success
'status with added file in modified submodule (porcelain)' '
157 (cd sub && git reset --hard && echo >foo && git add foo) &&
158 git status --porcelain >output &&
159 diff output - <<-\EOF
164 test_expect_success
'status with untracked file in modified submodule' '
165 (cd sub && git reset --hard) &&
166 echo "content" >sub/new-file &&
167 git status >output &&
168 test_i18ngrep "modified: sub (new commits, untracked content)" output
171 test_expect_success
'status with untracked file in modified submodule (porcelain)' '
172 git status --porcelain >output &&
173 diff output - <<-\EOF
178 test_expect_success
'status with added and untracked file in modified submodule' '
179 (cd sub && git reset --hard && echo >foo && git add foo) &&
180 echo "content" >sub/new-file &&
181 git status >output &&
182 test_i18ngrep "modified: sub (new commits, modified content, untracked content)" output
185 test_expect_success
'status with added and untracked file in modified submodule (porcelain)' '
186 (cd sub && git reset --hard && echo >foo && git add foo) &&
187 echo "content" >sub/new-file &&
188 git status --porcelain >output &&
189 diff output - <<-\EOF
194 test_expect_success
'setup .git file for sub' '
197 REAL="$(pwd)/../.real" &&
199 echo "gitdir: $REAL" >.git) &&
200 echo .real >>.gitignore &&
201 git commit -m "added .real to .gitignore" .gitignore
204 test_expect_success
'status with added file in modified submodule with .git file' '
205 (cd sub && git reset --hard && echo >foo && git add foo) &&
206 git status >output &&
207 test_i18ngrep "modified: sub (new commits, modified content)" output
210 test_expect_success
'status with a lot of untracked files in the submodule' '
214 while test $i -lt 1024
217 i=$(( $i + 1 )) || exit 1
220 git status --porcelain sub 2>err.actual &&
221 test_must_be_empty err.actual &&
225 test_expect_success
'rm submodule contents' '
230 test_expect_success
'status clean (empty submodule dir)' '
231 git status >output &&
232 test_i18ngrep "nothing to commit" output
235 test_expect_success
'status -a clean (empty submodule dir)' '
236 test_must_fail git commit --dry-run -a >output &&
237 test_i18ngrep "nothing to commit" output
240 cat >status_expect
<<\EOF
245 test_expect_success
'status with merge conflict in .gitmodules' '
247 test_create_repo_with_commit sub1 &&
249 test_create_repo_with_commit sub2 &&
252 prev=$(git rev-parse HEAD) &&
253 git checkout -b add_sub1 &&
254 git submodule add ../sub1 &&
255 git commit -m "add sub1" &&
256 git checkout -b add_sub2 $prev &&
257 git submodule add ../sub2 &&
258 git commit -m "add sub2" &&
259 git checkout -b merge_conflict_gitmodules &&
260 test_must_fail git merge add_sub1 &&
261 git status -s >../status_actual 2>&1
263 test_cmp status_actual status_expect
266 sha1_merge_sub1
=$
(cd sub1
&& git rev-parse HEAD
)
267 sha1_merge_sub2
=$
(cd sub2
&& git rev-parse HEAD
)
268 short_sha1_merge_sub1
=$
(cd sub1
&& git rev-parse
--short HEAD
)
269 short_sha1_merge_sub2
=$
(cd sub2
&& git rev-parse
--short HEAD
)
270 cat >diff_expect
<<\EOF
271 diff --cc .gitmodules
272 index badaa4c
,44f999a.
.0000000
275 @@@
-1,3 -1,3 +1,9 @@@
287 cat >diff_submodule_expect <<\EOF
288 diff --cc .gitmodules
289 index badaa4c,44f999a..0000000
292 @@@ -1,3 -1,3 +1,9 @@@
304 test_expect_success 'diff with merge conflict in .gitmodules' '
307 git diff >../diff_actual 2>&1
309 test_cmp diff_expect diff_actual
312 test_expect_success 'diff --submodule with merge conflict in .gitmodules' '
315 git diff --submodule >../diff_submodule_actual 2>&1
317 test_cmp diff_submodule_expect diff_submodule_actual
320 # We'll setup different cases for further testing:
321 # sub1 will contain a nested submodule,
322 # sub2 will have an untracked file
323 # sub3 will have an untracked repository
324 test_expect_success 'setup superproject with untracked file in nested submodule' '
328 git rm .gitmodules &&
329 git commit -m "remove .gitmodules" &&
330 git submodule add -f ./sub1 &&
331 git submodule add -f ./sub2 &&
332 git submodule add -f ./sub1 sub3 &&
333 git commit -a -m "messy merge in superproject" &&
336 git submodule add ../sub2 &&
337 git commit -a -m "add sub2 to sub1"
340 git commit -a -m "update sub1 to contain nested sub"
342 echo content >super/sub1/sub2/file &&
343 echo content >super/sub2/file &&
344 git -C super/sub3 clone ../../sub2 untracked_repository
347 test_expect_success 'status with untracked file in nested submodule (porcelain)' '
348 git -C super status --porcelain >output &&
349 diff output - <<-\EOF
356 test_expect_success 'status with untracked file in nested submodule (porcelain=2)' '
357 git -C super status --porcelain=2 >output &&
358 sanitize_output output &&
359 diff output - <<-\EOF
360 1 .M S..U 160000 160000 160000 HASH HASH sub1
361 1 .M S..U 160000 160000 160000 HASH HASH sub2
362 1 .M S..U 160000 160000 160000 HASH HASH sub3
366 test_expect_success 'status with untracked file in nested submodule (short)' '
367 git -C super status --short >output &&
368 diff output - <<-\EOF
375 test_expect_success 'setup superproject with modified file in nested submodule' '
376 git -C super/sub1/sub2 add file &&
377 git -C super/sub2 add file
380 test_expect_success 'status with added file in nested submodule (porcelain)' '
381 git -C super status --porcelain >output &&
382 diff output - <<-\EOF
389 test_expect_success 'status with added file in nested submodule (porcelain=2)' '
390 git -C super status --porcelain=2 >output &&
391 sanitize_output output &&
392 diff output - <<-\EOF
393 1 .M S.M. 160000 160000 160000 HASH HASH sub1
394 1 .M S.M. 160000 160000 160000 HASH HASH sub2
395 1 .M S..U 160000 160000 160000 HASH HASH sub3
399 test_expect_success 'status with added file in nested submodule (short)' '
400 git -C super status --short >output &&
401 diff output - <<-\EOF