]>
Commit | Line | Data |
---|---|---|
367c9886 JS |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2007 Johannes E. Schindelin | |
4 | # | |
5 | ||
47a528ad | 6 | test_description='git status' |
367c9886 JS |
7 | |
8 | . ./test-lib.sh | |
9 | ||
10 | test_expect_success 'setup' ' | |
68cfc6f5 MG |
11 | : >tracked && |
12 | : >modified && | |
367c9886 | 13 | mkdir dir1 && |
68cfc6f5 MG |
14 | : >dir1/tracked && |
15 | : >dir1/modified && | |
367c9886 | 16 | mkdir dir2 && |
68cfc6f5 MG |
17 | : >dir1/tracked && |
18 | : >dir1/modified && | |
367c9886 | 19 | git add . && |
ff58b9aa JK |
20 | |
21 | git status >output && | |
22 | ||
367c9886 JS |
23 | test_tick && |
24 | git commit -m initial && | |
68cfc6f5 MG |
25 | : >untracked && |
26 | : >dir1/untracked && | |
27 | : >dir2/untracked && | |
28 | echo 1 >dir1/modified && | |
29 | echo 2 >dir2/modified && | |
30 | echo 3 >dir2/added && | |
367c9886 JS |
31 | git add dir2/added |
32 | ' | |
33 | ||
ff58b9aa JK |
34 | test_expect_success 'status (1)' ' |
35 | ||
aadbe44f | 36 | grep "use \"git rm --cached <file>\.\.\.\" to unstage" output |
ff58b9aa JK |
37 | |
38 | ' | |
39 | ||
68cfc6f5 | 40 | cat >expect <<\EOF |
367c9886 JS |
41 | # On branch master |
42 | # Changes to be committed: | |
43 | # (use "git reset HEAD <file>..." to unstage) | |
44 | # | |
45 | # new file: dir2/added | |
46 | # | |
47 | # Changed but not updated: | |
48 | # (use "git add <file>..." to update what will be committed) | |
4d6e4c4d | 49 | # (use "git checkout -- <file>..." to discard changes in working directory) |
367c9886 JS |
50 | # |
51 | # modified: dir1/modified | |
52 | # | |
53 | # Untracked files: | |
54 | # (use "git add <file>..." to include in what will be committed) | |
55 | # | |
56 | # dir1/untracked | |
57 | # dir2/modified | |
58 | # dir2/untracked | |
59 | # expect | |
60 | # output | |
61 | # untracked | |
62 | EOF | |
63 | ||
ff58b9aa | 64 | test_expect_success 'status (2)' ' |
367c9886 | 65 | |
68cfc6f5 | 66 | git status >output && |
3af82863 | 67 | test_cmp expect output |
367c9886 JS |
68 | |
69 | ' | |
70 | ||
68cfc6f5 | 71 | cat >expect <<\EOF |
14ed05dd MG |
72 | M dir1/modified |
73 | A dir2/added | |
74 | ?? dir1/untracked | |
75 | ?? dir2/modified | |
76 | ?? dir2/untracked | |
77 | ?? expect | |
78 | ?? output | |
79 | ?? untracked | |
80 | EOF | |
81 | ||
82 | test_expect_success 'status -s (2)' ' | |
83 | ||
68cfc6f5 | 84 | git status -s >output && |
14ed05dd MG |
85 | test_cmp expect output |
86 | ||
87 | ' | |
88 | ||
6c2ce048 MSO |
89 | cat >expect <<EOF |
90 | # On branch master | |
91 | # Changes to be committed: | |
92 | # (use "git reset HEAD <file>..." to unstage) | |
93 | # | |
94 | # new file: dir2/added | |
95 | # | |
96 | # Changed but not updated: | |
97 | # (use "git add <file>..." to update what will be committed) | |
4d6e4c4d | 98 | # (use "git checkout -- <file>..." to discard changes in working directory) |
6c2ce048 MSO |
99 | # |
100 | # modified: dir1/modified | |
101 | # | |
102 | # Untracked files not listed (use -u option to show untracked files) | |
103 | EOF | |
104 | test_expect_success 'status -uno' ' | |
105 | mkdir dir3 && | |
68cfc6f5 MG |
106 | : >dir3/untracked1 && |
107 | : >dir3/untracked2 && | |
6c2ce048 MSO |
108 | git status -uno >output && |
109 | test_cmp expect output | |
110 | ' | |
111 | ||
d6293d1f MSO |
112 | test_expect_success 'status (status.showUntrackedFiles no)' ' |
113 | git config status.showuntrackedfiles no | |
114 | git status >output && | |
115 | test_cmp expect output | |
116 | ' | |
117 | ||
14ed05dd MG |
118 | cat >expect << EOF |
119 | M dir1/modified | |
120 | A dir2/added | |
121 | EOF | |
122 | test_expect_success 'status -s -uno' ' | |
123 | git config --unset status.showuntrackedfiles | |
124 | git status -s -uno >output && | |
125 | test_cmp expect output | |
126 | ' | |
127 | ||
128 | test_expect_success 'status -s (status.showUntrackedFiles no)' ' | |
129 | git config status.showuntrackedfiles no | |
130 | git status -s >output && | |
131 | test_cmp expect output | |
132 | ' | |
133 | ||
4bfee30a MSO |
134 | cat >expect <<EOF |
135 | # On branch master | |
136 | # Changes to be committed: | |
137 | # (use "git reset HEAD <file>..." to unstage) | |
138 | # | |
139 | # new file: dir2/added | |
140 | # | |
141 | # Changed but not updated: | |
142 | # (use "git add <file>..." to update what will be committed) | |
4d6e4c4d | 143 | # (use "git checkout -- <file>..." to discard changes in working directory) |
4bfee30a MSO |
144 | # |
145 | # modified: dir1/modified | |
146 | # | |
147 | # Untracked files: | |
148 | # (use "git add <file>..." to include in what will be committed) | |
149 | # | |
150 | # dir1/untracked | |
151 | # dir2/modified | |
152 | # dir2/untracked | |
153 | # dir3/ | |
154 | # expect | |
155 | # output | |
156 | # untracked | |
157 | EOF | |
158 | test_expect_success 'status -unormal' ' | |
4bfee30a MSO |
159 | git status -unormal >output && |
160 | test_cmp expect output | |
161 | ' | |
162 | ||
d6293d1f MSO |
163 | test_expect_success 'status (status.showUntrackedFiles normal)' ' |
164 | git config status.showuntrackedfiles normal | |
165 | git status >output && | |
166 | test_cmp expect output | |
167 | ' | |
168 | ||
14ed05dd MG |
169 | cat >expect <<EOF |
170 | M dir1/modified | |
171 | A dir2/added | |
172 | ?? dir1/untracked | |
173 | ?? dir2/modified | |
174 | ?? dir2/untracked | |
175 | ?? dir3/ | |
176 | ?? expect | |
177 | ?? output | |
178 | ?? untracked | |
179 | EOF | |
180 | test_expect_success 'status -s -unormal' ' | |
181 | git config --unset status.showuntrackedfiles | |
182 | git status -s -unormal >output && | |
183 | test_cmp expect output | |
184 | ' | |
185 | ||
186 | test_expect_success 'status -s (status.showUntrackedFiles normal)' ' | |
187 | git config status.showuntrackedfiles normal | |
188 | git status -s >output && | |
189 | test_cmp expect output | |
190 | ' | |
191 | ||
4bfee30a MSO |
192 | cat >expect <<EOF |
193 | # On branch master | |
194 | # Changes to be committed: | |
195 | # (use "git reset HEAD <file>..." to unstage) | |
196 | # | |
197 | # new file: dir2/added | |
198 | # | |
199 | # Changed but not updated: | |
200 | # (use "git add <file>..." to update what will be committed) | |
4d6e4c4d | 201 | # (use "git checkout -- <file>..." to discard changes in working directory) |
4bfee30a MSO |
202 | # |
203 | # modified: dir1/modified | |
204 | # | |
205 | # Untracked files: | |
206 | # (use "git add <file>..." to include in what will be committed) | |
207 | # | |
208 | # dir1/untracked | |
209 | # dir2/modified | |
210 | # dir2/untracked | |
211 | # dir3/untracked1 | |
212 | # dir3/untracked2 | |
213 | # expect | |
214 | # output | |
215 | # untracked | |
216 | EOF | |
217 | test_expect_success 'status -uall' ' | |
218 | git status -uall >output && | |
d6293d1f MSO |
219 | test_cmp expect output |
220 | ' | |
221 | test_expect_success 'status (status.showUntrackedFiles all)' ' | |
222 | git config status.showuntrackedfiles all | |
223 | git status >output && | |
4bfee30a | 224 | rm -rf dir3 && |
d6293d1f | 225 | git config --unset status.showuntrackedfiles && |
4bfee30a MSO |
226 | test_cmp expect output |
227 | ' | |
228 | ||
14ed05dd MG |
229 | cat >expect <<EOF |
230 | M dir1/modified | |
231 | A dir2/added | |
232 | ?? dir1/untracked | |
233 | ?? dir2/modified | |
234 | ?? dir2/untracked | |
235 | ?? expect | |
236 | ?? output | |
237 | ?? untracked | |
238 | EOF | |
239 | test_expect_success 'status -s -uall' ' | |
240 | git config --unset status.showuntrackedfiles | |
241 | git status -s -uall >output && | |
242 | test_cmp expect output | |
243 | ' | |
244 | test_expect_success 'status -s (status.showUntrackedFiles all)' ' | |
245 | git config status.showuntrackedfiles all | |
246 | git status -s >output && | |
247 | rm -rf dir3 && | |
248 | git config --unset status.showuntrackedfiles && | |
249 | test_cmp expect output | |
250 | ' | |
251 | ||
68cfc6f5 | 252 | cat >expect <<\EOF |
367c9886 JS |
253 | # On branch master |
254 | # Changes to be committed: | |
255 | # (use "git reset HEAD <file>..." to unstage) | |
256 | # | |
257 | # new file: ../dir2/added | |
258 | # | |
259 | # Changed but not updated: | |
260 | # (use "git add <file>..." to update what will be committed) | |
4d6e4c4d | 261 | # (use "git checkout -- <file>..." to discard changes in working directory) |
367c9886 | 262 | # |
69e74918 | 263 | # modified: modified |
367c9886 JS |
264 | # |
265 | # Untracked files: | |
266 | # (use "git add <file>..." to include in what will be committed) | |
267 | # | |
268 | # untracked | |
269 | # ../dir2/modified | |
270 | # ../dir2/untracked | |
271 | # ../expect | |
272 | # ../output | |
273 | # ../untracked | |
274 | EOF | |
275 | ||
276 | test_expect_success 'status with relative paths' ' | |
277 | ||
68cfc6f5 | 278 | (cd dir1 && git status) >output && |
3af82863 | 279 | test_cmp expect output |
367c9886 JS |
280 | |
281 | ' | |
282 | ||
68cfc6f5 | 283 | cat >expect <<\EOF |
14ed05dd MG |
284 | M modified |
285 | A ../dir2/added | |
286 | ?? untracked | |
287 | ?? ../dir2/modified | |
288 | ?? ../dir2/untracked | |
289 | ?? ../expect | |
290 | ?? ../output | |
291 | ?? ../untracked | |
292 | EOF | |
293 | test_expect_success 'status -s with relative paths' ' | |
294 | ||
68cfc6f5 | 295 | (cd dir1 && git status -s) >output && |
14ed05dd MG |
296 | test_cmp expect output |
297 | ||
298 | ' | |
299 | ||
68cfc6f5 | 300 | cat >expect <<\EOF |
c521bb71 MG |
301 | M dir1/modified |
302 | A dir2/added | |
303 | ?? dir1/untracked | |
304 | ?? dir2/modified | |
305 | ?? dir2/untracked | |
306 | ?? expect | |
307 | ?? output | |
308 | ?? untracked | |
309 | EOF | |
310 | ||
311 | test_expect_success 'status --porcelain ignores relative paths setting' ' | |
312 | ||
68cfc6f5 | 313 | (cd dir1 && git status --porcelain) >output && |
c521bb71 MG |
314 | test_cmp expect output |
315 | ||
316 | ' | |
317 | ||
68cfc6f5 MG |
318 | test_expect_success 'setup unique colors' ' |
319 | ||
320 | git config status.color.untracked blue | |
321 | ||
322 | ' | |
323 | ||
324 | cat >expect <<\EOF | |
325 | # On branch master | |
326 | # Changes to be committed: | |
327 | # (use "git reset HEAD <file>..." to unstage) | |
328 | # | |
329 | # <GREEN>new file: dir2/added<RESET> | |
330 | # | |
331 | # Changed but not updated: | |
332 | # (use "git add <file>..." to update what will be committed) | |
333 | # (use "git checkout -- <file>..." to discard changes in working directory) | |
334 | # | |
335 | # <RED>modified: dir1/modified<RESET> | |
336 | # | |
337 | # Untracked files: | |
338 | # (use "git add <file>..." to include in what will be committed) | |
339 | # | |
340 | # <BLUE>dir1/untracked<RESET> | |
341 | # <BLUE>dir2/modified<RESET> | |
342 | # <BLUE>dir2/untracked<RESET> | |
343 | # <BLUE>expect<RESET> | |
344 | # <BLUE>output<RESET> | |
345 | # <BLUE>untracked<RESET> | |
346 | EOF | |
347 | ||
348 | test_expect_success 'status with color.ui' ' | |
349 | ||
350 | git config color.ui always && | |
351 | git status | test_decode_color >output && | |
352 | test_cmp expect output | |
353 | ||
354 | ' | |
355 | ||
356 | test_expect_success 'status with color.status' ' | |
357 | ||
358 | git config --unset color.ui && | |
359 | git config color.status always && | |
360 | git status | test_decode_color >output && | |
361 | test_cmp expect output | |
362 | ||
363 | ' | |
364 | ||
365 | cat >expect <<\EOF | |
366 | <RED>M<RESET> dir1/modified | |
367 | <GREEN>A<RESET> dir2/added | |
368 | <BLUE>??<RESET> dir1/untracked | |
369 | <BLUE>??<RESET> dir2/modified | |
370 | <BLUE>??<RESET> dir2/untracked | |
371 | <BLUE>??<RESET> expect | |
372 | <BLUE>??<RESET> output | |
373 | <BLUE>??<RESET> untracked | |
374 | EOF | |
375 | ||
376 | test_expect_success 'status -s with color.ui' ' | |
377 | ||
378 | git config --unset color.status && | |
379 | git config color.ui always && | |
380 | git status -s | test_decode_color >output && | |
381 | test_cmp expect output | |
382 | ||
383 | ' | |
384 | ||
385 | test_expect_success 'status -s with color.status' ' | |
386 | ||
387 | git config --unset color.ui && | |
388 | git config color.status always && | |
389 | git status -s | test_decode_color >output && | |
390 | test_cmp expect output | |
391 | ||
392 | ' | |
393 | ||
394 | cat >expect <<\EOF | |
395 | M dir1/modified | |
396 | A dir2/added | |
397 | ?? dir1/untracked | |
398 | ?? dir2/modified | |
399 | ?? dir2/untracked | |
400 | ?? expect | |
401 | ?? output | |
402 | ?? untracked | |
403 | EOF | |
404 | ||
405 | test_expect_success 'status --porcelain ignores color.ui' ' | |
406 | ||
407 | git config --unset color.status && | |
408 | git config color.ui always && | |
409 | git status --porcelain | test_decode_color >output && | |
410 | test_cmp expect output | |
411 | ||
412 | ' | |
413 | ||
414 | test_expect_success 'status --porcelain ignores color.status' ' | |
415 | ||
416 | git config --unset color.ui && | |
417 | git config color.status always && | |
418 | git status --porcelain | test_decode_color >output && | |
419 | test_cmp expect output | |
420 | ||
421 | ' | |
422 | ||
423 | # recover unconditionally from color tests | |
424 | git config --unset color.status | |
425 | git config --unset color.ui | |
426 | ||
427 | cat >expect <<\EOF | |
46f721c8 JK |
428 | # On branch master |
429 | # Changes to be committed: | |
430 | # (use "git reset HEAD <file>..." to unstage) | |
431 | # | |
432 | # new file: dir2/added | |
433 | # | |
434 | # Changed but not updated: | |
435 | # (use "git add <file>..." to update what will be committed) | |
4d6e4c4d | 436 | # (use "git checkout -- <file>..." to discard changes in working directory) |
46f721c8 JK |
437 | # |
438 | # modified: dir1/modified | |
439 | # | |
440 | # Untracked files: | |
441 | # (use "git add <file>..." to include in what will be committed) | |
442 | # | |
443 | # dir1/untracked | |
444 | # dir2/modified | |
445 | # dir2/untracked | |
446 | # expect | |
447 | # output | |
448 | # untracked | |
449 | EOF | |
450 | ||
68cfc6f5 | 451 | |
46f721c8 JK |
452 | test_expect_success 'status without relative paths' ' |
453 | ||
454 | git config status.relativePaths false | |
68cfc6f5 | 455 | (cd dir1 && git status) >output && |
3af82863 | 456 | test_cmp expect output |
46f721c8 JK |
457 | |
458 | ' | |
459 | ||
68cfc6f5 | 460 | cat >expect <<\EOF |
14ed05dd MG |
461 | M dir1/modified |
462 | A dir2/added | |
463 | ?? dir1/untracked | |
464 | ?? dir2/modified | |
465 | ?? dir2/untracked | |
466 | ?? expect | |
467 | ?? output | |
468 | ?? untracked | |
469 | EOF | |
470 | ||
471 | test_expect_success 'status -s without relative paths' ' | |
472 | ||
68cfc6f5 | 473 | (cd dir1 && git status -s) >output && |
14ed05dd MG |
474 | test_cmp expect output |
475 | ||
476 | ' | |
477 | ||
959ba670 JK |
478 | cat <<EOF >expect |
479 | # On branch master | |
480 | # Changes to be committed: | |
481 | # (use "git reset HEAD <file>..." to unstage) | |
482 | # | |
483 | # modified: dir1/modified | |
484 | # | |
485 | # Untracked files: | |
486 | # (use "git add <file>..." to include in what will be committed) | |
487 | # | |
488 | # dir1/untracked | |
489 | # dir2/ | |
490 | # expect | |
491 | # output | |
492 | # untracked | |
493 | EOF | |
9e4b7ab6 JH |
494 | test_expect_success 'dry-run of partial commit excluding new file in index' ' |
495 | git commit --dry-run dir1/modified >output && | |
82ebb0b6 | 496 | test_cmp expect output |
959ba670 JK |
497 | ' |
498 | ||
e5e4a7f2 PY |
499 | test_expect_success 'setup status submodule summary' ' |
500 | test_create_repo sm && ( | |
501 | cd sm && | |
502 | >foo && | |
503 | git add foo && | |
504 | git commit -m "Add foo" | |
505 | ) && | |
506 | git add sm | |
507 | ' | |
508 | ||
509 | cat >expect <<EOF | |
510 | # On branch master | |
511 | # Changes to be committed: | |
512 | # (use "git reset HEAD <file>..." to unstage) | |
513 | # | |
514 | # new file: dir2/added | |
515 | # new file: sm | |
516 | # | |
517 | # Changed but not updated: | |
518 | # (use "git add <file>..." to update what will be committed) | |
4d6e4c4d | 519 | # (use "git checkout -- <file>..." to discard changes in working directory) |
e5e4a7f2 PY |
520 | # |
521 | # modified: dir1/modified | |
522 | # | |
523 | # Untracked files: | |
524 | # (use "git add <file>..." to include in what will be committed) | |
525 | # | |
526 | # dir1/untracked | |
527 | # dir2/modified | |
528 | # dir2/untracked | |
529 | # expect | |
530 | # output | |
531 | # untracked | |
532 | EOF | |
533 | test_expect_success 'status submodule summary is disabled by default' ' | |
534 | git status >output && | |
535 | test_cmp expect output | |
536 | ' | |
537 | ||
98fa4738 JK |
538 | # we expect the same as the previous test |
539 | test_expect_success 'status --untracked-files=all does not show submodule' ' | |
540 | git status --untracked-files=all >output && | |
e5e4a7f2 PY |
541 | test_cmp expect output |
542 | ' | |
543 | ||
14ed05dd MG |
544 | cat >expect <<EOF |
545 | M dir1/modified | |
546 | A dir2/added | |
547 | A sm | |
548 | ?? dir1/untracked | |
549 | ?? dir2/modified | |
550 | ?? dir2/untracked | |
551 | ?? expect | |
552 | ?? output | |
553 | ?? untracked | |
554 | EOF | |
555 | test_expect_success 'status -s submodule summary is disabled by default' ' | |
556 | git status -s >output && | |
557 | test_cmp expect output | |
558 | ' | |
559 | ||
560 | # we expect the same as the previous test | |
561 | test_expect_success 'status -s --untracked-files=all does not show submodule' ' | |
562 | git status -s --untracked-files=all >output && | |
563 | test_cmp expect output | |
564 | ' | |
565 | ||
e5e4a7f2 PY |
566 | head=$(cd sm && git rev-parse --short=7 --verify HEAD) |
567 | ||
568 | cat >expect <<EOF | |
569 | # On branch master | |
570 | # Changes to be committed: | |
571 | # (use "git reset HEAD <file>..." to unstage) | |
572 | # | |
573 | # new file: dir2/added | |
574 | # new file: sm | |
575 | # | |
576 | # Changed but not updated: | |
577 | # (use "git add <file>..." to update what will be committed) | |
4d6e4c4d | 578 | # (use "git checkout -- <file>..." to discard changes in working directory) |
e5e4a7f2 PY |
579 | # |
580 | # modified: dir1/modified | |
581 | # | |
f17a5d34 | 582 | # Submodule changes to be committed: |
e5e4a7f2 PY |
583 | # |
584 | # * sm 0000000...$head (1): | |
585 | # > Add foo | |
586 | # | |
587 | # Untracked files: | |
588 | # (use "git add <file>..." to include in what will be committed) | |
589 | # | |
590 | # dir1/untracked | |
591 | # dir2/modified | |
592 | # dir2/untracked | |
593 | # expect | |
594 | # output | |
595 | # untracked | |
596 | EOF | |
597 | test_expect_success 'status submodule summary' ' | |
598 | git config status.submodulesummary 10 && | |
599 | git status >output && | |
600 | test_cmp expect output | |
601 | ' | |
602 | ||
14ed05dd MG |
603 | cat >expect <<EOF |
604 | M dir1/modified | |
605 | A dir2/added | |
606 | A sm | |
607 | ?? dir1/untracked | |
608 | ?? dir2/modified | |
609 | ?? dir2/untracked | |
610 | ?? expect | |
611 | ?? output | |
612 | ?? untracked | |
613 | EOF | |
614 | test_expect_success 'status -s submodule summary' ' | |
615 | git status -s >output && | |
616 | test_cmp expect output | |
617 | ' | |
e5e4a7f2 PY |
618 | |
619 | cat >expect <<EOF | |
620 | # On branch master | |
621 | # Changed but not updated: | |
622 | # (use "git add <file>..." to update what will be committed) | |
4d6e4c4d | 623 | # (use "git checkout -- <file>..." to discard changes in working directory) |
e5e4a7f2 PY |
624 | # |
625 | # modified: dir1/modified | |
626 | # | |
627 | # Untracked files: | |
628 | # (use "git add <file>..." to include in what will be committed) | |
629 | # | |
630 | # dir1/untracked | |
631 | # dir2/modified | |
632 | # dir2/untracked | |
633 | # expect | |
634 | # output | |
635 | # untracked | |
636 | no changes added to commit (use "git add" and/or "git commit -a") | |
637 | EOF | |
638 | test_expect_success 'status submodule summary (clean submodule)' ' | |
639 | git commit -m "commit submodule" && | |
640 | git config status.submodulesummary 10 && | |
9e4b7ab6 JH |
641 | test_must_fail git commit --dry-run >output && |
642 | test_cmp expect output && | |
643 | git status >output && | |
e5e4a7f2 PY |
644 | test_cmp expect output |
645 | ' | |
646 | ||
14ed05dd MG |
647 | cat >expect <<EOF |
648 | M dir1/modified | |
649 | ?? dir1/untracked | |
650 | ?? dir2/modified | |
651 | ?? dir2/untracked | |
652 | ?? expect | |
653 | ?? output | |
654 | ?? untracked | |
655 | EOF | |
656 | test_expect_success 'status -s submodule summary (clean submodule)' ' | |
657 | git status -s >output && | |
658 | test_cmp expect output | |
659 | ' | |
660 | ||
e5e4a7f2 PY |
661 | cat >expect <<EOF |
662 | # On branch master | |
663 | # Changes to be committed: | |
664 | # (use "git reset HEAD^1 <file>..." to unstage) | |
665 | # | |
666 | # new file: dir2/added | |
667 | # new file: sm | |
668 | # | |
669 | # Changed but not updated: | |
670 | # (use "git add <file>..." to update what will be committed) | |
4d6e4c4d | 671 | # (use "git checkout -- <file>..." to discard changes in working directory) |
e5e4a7f2 PY |
672 | # |
673 | # modified: dir1/modified | |
674 | # | |
f17a5d34 | 675 | # Submodule changes to be committed: |
e5e4a7f2 PY |
676 | # |
677 | # * sm 0000000...$head (1): | |
678 | # > Add foo | |
679 | # | |
680 | # Untracked files: | |
681 | # (use "git add <file>..." to include in what will be committed) | |
682 | # | |
683 | # dir1/untracked | |
684 | # dir2/modified | |
685 | # dir2/untracked | |
686 | # expect | |
687 | # output | |
688 | # untracked | |
689 | EOF | |
9e4b7ab6 | 690 | test_expect_success 'commit --dry-run submodule summary (--amend)' ' |
e5e4a7f2 | 691 | git config status.submodulesummary 10 && |
9e4b7ab6 | 692 | git commit --dry-run --amend >output && |
e5e4a7f2 PY |
693 | test_cmp expect output |
694 | ' | |
695 | ||
367c9886 | 696 | test_done |