Merge branch 'cb/maint-orphan-merge-noclobber'
[git/kirr.git] / t / t7508-status.sh
blob4de3e27950ca34ffe3f5e72052108ce9d74b0227
1 #!/bin/sh
3 # Copyright (c) 2007 Johannes E. Schindelin
6 test_description='git status'
8 . ./test-lib.sh
10 test_expect_success 'setup' '
11 : >tracked &&
12 : >modified &&
13 mkdir dir1 &&
14 : >dir1/tracked &&
15 : >dir1/modified &&
16 mkdir dir2 &&
17 : >dir1/tracked &&
18 : >dir1/modified &&
19 git add . &&
21 git status >output &&
23 test_tick &&
24 git commit -m initial &&
25 : >untracked &&
26 : >dir1/untracked &&
27 : >dir2/untracked &&
28 echo 1 >dir1/modified &&
29 echo 2 >dir2/modified &&
30 echo 3 >dir2/added &&
31 git add dir2/added
34 test_expect_success 'status (1)' '
36 grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
40 cat >expect <<\EOF
41 # On branch master
42 # Changes to be committed:
43 # (use "git reset HEAD <file>..." to unstage)
45 # new file: dir2/added
47 # Changes not staged for commit:
48 # (use "git add <file>..." to update what will be committed)
49 # (use "git checkout -- <file>..." to discard changes in working directory)
51 # modified: dir1/modified
53 # Untracked files:
54 # (use "git add <file>..." to include in what will be committed)
56 # dir1/untracked
57 # dir2/modified
58 # dir2/untracked
59 # expect
60 # output
61 # untracked
62 EOF
64 test_expect_success 'status (2)' '
66 git status >output &&
67 test_cmp expect output
71 cat >expect <<\EOF
72 # On branch master
73 # Changes to be committed:
74 # new file: dir2/added
76 # Changes not staged for commit:
77 # modified: dir1/modified
79 # Untracked files:
80 # dir1/untracked
81 # dir2/modified
82 # dir2/untracked
83 # expect
84 # output
85 # untracked
86 EOF
88 git config advice.statusHints false
90 test_expect_success 'status (advice.statusHints false)' '
92 git status >output &&
93 test_cmp expect output
97 git config --unset advice.statusHints
99 cat >expect <<\EOF
100 M dir1/modified
101 A dir2/added
102 ?? dir1/untracked
103 ?? dir2/modified
104 ?? dir2/untracked
105 ?? expect
106 ?? output
107 ?? untracked
110 test_expect_success 'status -s' '
112 git status -s >output &&
113 test_cmp expect output
117 cat >expect <<\EOF
118 ## master
119 M dir1/modified
120 A dir2/added
121 ?? dir1/untracked
122 ?? dir2/modified
123 ?? dir2/untracked
124 ?? expect
125 ?? output
126 ?? untracked
129 test_expect_success 'status -s -b' '
131 git status -s -b >output &&
132 test_cmp expect output
136 cat >expect <<EOF
137 # On branch master
138 # Changes to be committed:
139 # (use "git reset HEAD <file>..." to unstage)
141 # new file: dir2/added
143 # Changes not staged for commit:
144 # (use "git add <file>..." to update what will be committed)
145 # (use "git checkout -- <file>..." to discard changes in working directory)
147 # modified: dir1/modified
149 # Untracked files not listed (use -u option to show untracked files)
151 test_expect_success 'status -uno' '
152 mkdir dir3 &&
153 : >dir3/untracked1 &&
154 : >dir3/untracked2 &&
155 git status -uno >output &&
156 test_cmp expect output
159 test_expect_success 'status (status.showUntrackedFiles no)' '
160 git config status.showuntrackedfiles no
161 git status >output &&
162 test_cmp expect output
165 cat >expect <<EOF
166 # On branch master
167 # Changes to be committed:
168 # new file: dir2/added
170 # Changes not staged for commit:
171 # modified: dir1/modified
173 # Untracked files not listed
175 git config advice.statusHints false
176 test_expect_success 'status -uno (advice.statusHints false)' '
177 git status -uno >output &&
178 test_cmp expect output
180 git config --unset advice.statusHints
182 cat >expect << EOF
183 M dir1/modified
184 A dir2/added
186 test_expect_success 'status -s -uno' '
187 git config --unset status.showuntrackedfiles
188 git status -s -uno >output &&
189 test_cmp expect output
192 test_expect_success 'status -s (status.showUntrackedFiles no)' '
193 git config status.showuntrackedfiles no
194 git status -s >output &&
195 test_cmp expect output
198 cat >expect <<EOF
199 # On branch master
200 # Changes to be committed:
201 # (use "git reset HEAD <file>..." to unstage)
203 # new file: dir2/added
205 # Changes not staged for commit:
206 # (use "git add <file>..." to update what will be committed)
207 # (use "git checkout -- <file>..." to discard changes in working directory)
209 # modified: dir1/modified
211 # Untracked files:
212 # (use "git add <file>..." to include in what will be committed)
214 # dir1/untracked
215 # dir2/modified
216 # dir2/untracked
217 # dir3/
218 # expect
219 # output
220 # untracked
222 test_expect_success 'status -unormal' '
223 git status -unormal >output &&
224 test_cmp expect output
227 test_expect_success 'status (status.showUntrackedFiles normal)' '
228 git config status.showuntrackedfiles normal
229 git status >output &&
230 test_cmp expect output
233 cat >expect <<EOF
234 M dir1/modified
235 A dir2/added
236 ?? dir1/untracked
237 ?? dir2/modified
238 ?? dir2/untracked
239 ?? dir3/
240 ?? expect
241 ?? output
242 ?? untracked
244 test_expect_success 'status -s -unormal' '
245 git config --unset status.showuntrackedfiles
246 git status -s -unormal >output &&
247 test_cmp expect output
250 test_expect_success 'status -s (status.showUntrackedFiles normal)' '
251 git config status.showuntrackedfiles normal
252 git status -s >output &&
253 test_cmp expect output
256 cat >expect <<EOF
257 # On branch master
258 # Changes to be committed:
259 # (use "git reset HEAD <file>..." to unstage)
261 # new file: dir2/added
263 # Changes not staged for commit:
264 # (use "git add <file>..." to update what will be committed)
265 # (use "git checkout -- <file>..." to discard changes in working directory)
267 # modified: dir1/modified
269 # Untracked files:
270 # (use "git add <file>..." to include in what will be committed)
272 # dir1/untracked
273 # dir2/modified
274 # dir2/untracked
275 # dir3/untracked1
276 # dir3/untracked2
277 # expect
278 # output
279 # untracked
281 test_expect_success 'status -uall' '
282 git status -uall >output &&
283 test_cmp expect output
285 test_expect_success 'status (status.showUntrackedFiles all)' '
286 git config status.showuntrackedfiles all
287 git status >output &&
288 rm -rf dir3 &&
289 git config --unset status.showuntrackedfiles &&
290 test_cmp expect output
293 cat >expect <<EOF
294 M dir1/modified
295 A dir2/added
296 ?? dir1/untracked
297 ?? dir2/modified
298 ?? dir2/untracked
299 ?? expect
300 ?? output
301 ?? untracked
303 test_expect_success 'status -s -uall' '
304 git config --unset status.showuntrackedfiles
305 git status -s -uall >output &&
306 test_cmp expect output
308 test_expect_success 'status -s (status.showUntrackedFiles all)' '
309 git config status.showuntrackedfiles all
310 git status -s >output &&
311 rm -rf dir3 &&
312 git config --unset status.showuntrackedfiles &&
313 test_cmp expect output
316 cat >expect <<\EOF
317 # On branch master
318 # Changes to be committed:
319 # (use "git reset HEAD <file>..." to unstage)
321 # new file: ../dir2/added
323 # Changes not staged for commit:
324 # (use "git add <file>..." to update what will be committed)
325 # (use "git checkout -- <file>..." to discard changes in working directory)
327 # modified: modified
329 # Untracked files:
330 # (use "git add <file>..." to include in what will be committed)
332 # untracked
333 # ../dir2/modified
334 # ../dir2/untracked
335 # ../expect
336 # ../output
337 # ../untracked
340 test_expect_success 'status with relative paths' '
342 (cd dir1 && git status) >output &&
343 test_cmp expect output
347 cat >expect <<\EOF
348 M modified
349 A ../dir2/added
350 ?? untracked
351 ?? ../dir2/modified
352 ?? ../dir2/untracked
353 ?? ../expect
354 ?? ../output
355 ?? ../untracked
357 test_expect_success 'status -s with relative paths' '
359 (cd dir1 && git status -s) >output &&
360 test_cmp expect output
364 cat >expect <<\EOF
365 M dir1/modified
366 A dir2/added
367 ?? dir1/untracked
368 ?? dir2/modified
369 ?? dir2/untracked
370 ?? expect
371 ?? output
372 ?? untracked
375 test_expect_success 'status --porcelain ignores relative paths setting' '
377 (cd dir1 && git status --porcelain) >output &&
378 test_cmp expect output
382 test_expect_success 'setup unique colors' '
384 git config status.color.untracked blue
388 cat >expect <<\EOF
389 # On branch master
390 # Changes to be committed:
391 # (use "git reset HEAD <file>..." to unstage)
393 # <GREEN>new file: dir2/added<RESET>
395 # Changes not staged for commit:
396 # (use "git add <file>..." to update what will be committed)
397 # (use "git checkout -- <file>..." to discard changes in working directory)
399 # <RED>modified: dir1/modified<RESET>
401 # Untracked files:
402 # (use "git add <file>..." to include in what will be committed)
404 # <BLUE>dir1/untracked<RESET>
405 # <BLUE>dir2/modified<RESET>
406 # <BLUE>dir2/untracked<RESET>
407 # <BLUE>expect<RESET>
408 # <BLUE>output<RESET>
409 # <BLUE>untracked<RESET>
412 test_expect_success 'status with color.ui' '
414 git config color.ui always &&
415 git status | test_decode_color >output &&
416 test_cmp expect output
420 test_expect_success 'status with color.status' '
422 git config --unset color.ui &&
423 git config color.status always &&
424 git status | test_decode_color >output &&
425 test_cmp expect output
429 cat >expect <<\EOF
430 <RED>M<RESET> dir1/modified
431 <GREEN>A<RESET> dir2/added
432 <BLUE>??<RESET> dir1/untracked
433 <BLUE>??<RESET> dir2/modified
434 <BLUE>??<RESET> dir2/untracked
435 <BLUE>??<RESET> expect
436 <BLUE>??<RESET> output
437 <BLUE>??<RESET> untracked
440 test_expect_success 'status -s with color.ui' '
442 git config --unset color.status &&
443 git config color.ui always &&
444 git status -s | test_decode_color >output &&
445 test_cmp expect output
449 test_expect_success 'status -s with color.status' '
451 git config --unset color.ui &&
452 git config color.status always &&
453 git status -s | test_decode_color >output &&
454 test_cmp expect output
458 cat >expect <<\EOF
459 ## <GREEN>master<RESET>
460 <RED>M<RESET> dir1/modified
461 <GREEN>A<RESET> dir2/added
462 <BLUE>??<RESET> dir1/untracked
463 <BLUE>??<RESET> dir2/modified
464 <BLUE>??<RESET> dir2/untracked
465 <BLUE>??<RESET> expect
466 <BLUE>??<RESET> output
467 <BLUE>??<RESET> untracked
470 test_expect_success 'status -s -b with color.status' '
472 git status -s -b | test_decode_color >output &&
473 test_cmp expect output
477 cat >expect <<\EOF
478 M dir1/modified
479 A dir2/added
480 ?? dir1/untracked
481 ?? dir2/modified
482 ?? dir2/untracked
483 ?? expect
484 ?? output
485 ?? untracked
488 test_expect_success 'status --porcelain ignores color.ui' '
490 git config --unset color.status &&
491 git config color.ui always &&
492 git status --porcelain | test_decode_color >output &&
493 test_cmp expect output
497 test_expect_success 'status --porcelain ignores color.status' '
499 git config --unset color.ui &&
500 git config color.status always &&
501 git status --porcelain | test_decode_color >output &&
502 test_cmp expect output
506 # recover unconditionally from color tests
507 git config --unset color.status
508 git config --unset color.ui
510 test_expect_success 'status --porcelain ignores -b' '
512 git status --porcelain -b >output &&
513 test_cmp expect output
517 cat >expect <<\EOF
518 # On branch master
519 # Changes to be committed:
520 # (use "git reset HEAD <file>..." to unstage)
522 # new file: dir2/added
524 # Changes not staged for commit:
525 # (use "git add <file>..." to update what will be committed)
526 # (use "git checkout -- <file>..." to discard changes in working directory)
528 # modified: dir1/modified
530 # Untracked files:
531 # (use "git add <file>..." to include in what will be committed)
533 # dir1/untracked
534 # dir2/modified
535 # dir2/untracked
536 # expect
537 # output
538 # untracked
542 test_expect_success 'status without relative paths' '
544 git config status.relativePaths false
545 (cd dir1 && git status) >output &&
546 test_cmp expect output
550 cat >expect <<\EOF
551 M dir1/modified
552 A dir2/added
553 ?? dir1/untracked
554 ?? dir2/modified
555 ?? dir2/untracked
556 ?? expect
557 ?? output
558 ?? untracked
561 test_expect_success 'status -s without relative paths' '
563 (cd dir1 && git status -s) >output &&
564 test_cmp expect output
568 cat <<EOF >expect
569 # On branch master
570 # Changes to be committed:
571 # (use "git reset HEAD <file>..." to unstage)
573 # modified: dir1/modified
575 # Untracked files:
576 # (use "git add <file>..." to include in what will be committed)
578 # dir1/untracked
579 # dir2/
580 # expect
581 # output
582 # untracked
584 test_expect_success 'dry-run of partial commit excluding new file in index' '
585 git commit --dry-run dir1/modified >output &&
586 test_cmp expect output
589 cat >expect <<EOF
590 :100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 M dir1/modified
592 test_expect_success 'status refreshes the index' '
593 touch dir2/added &&
594 git status &&
595 git diff-files >output &&
596 test_cmp expect output
599 test_expect_success 'setup status submodule summary' '
600 test_create_repo sm && (
601 cd sm &&
602 >foo &&
603 git add foo &&
604 git commit -m "Add foo"
605 ) &&
606 git add sm
609 cat >expect <<EOF
610 # On branch master
611 # Changes to be committed:
612 # (use "git reset HEAD <file>..." to unstage)
614 # new file: dir2/added
615 # new file: sm
617 # Changes not staged for commit:
618 # (use "git add <file>..." to update what will be committed)
619 # (use "git checkout -- <file>..." to discard changes in working directory)
621 # modified: dir1/modified
623 # Untracked files:
624 # (use "git add <file>..." to include in what will be committed)
626 # dir1/untracked
627 # dir2/modified
628 # dir2/untracked
629 # expect
630 # output
631 # untracked
633 test_expect_success 'status submodule summary is disabled by default' '
634 git status >output &&
635 test_cmp expect output
638 # we expect the same as the previous test
639 test_expect_success 'status --untracked-files=all does not show submodule' '
640 git status --untracked-files=all >output &&
641 test_cmp expect output
644 cat >expect <<EOF
645 M dir1/modified
646 A dir2/added
647 A sm
648 ?? dir1/untracked
649 ?? dir2/modified
650 ?? dir2/untracked
651 ?? expect
652 ?? output
653 ?? untracked
655 test_expect_success 'status -s submodule summary is disabled by default' '
656 git status -s >output &&
657 test_cmp expect output
660 # we expect the same as the previous test
661 test_expect_success 'status -s --untracked-files=all does not show submodule' '
662 git status -s --untracked-files=all >output &&
663 test_cmp expect output
666 head=$(cd sm && git rev-parse --short=7 --verify HEAD)
668 cat >expect <<EOF
669 # On branch master
670 # Changes to be committed:
671 # (use "git reset HEAD <file>..." to unstage)
673 # new file: dir2/added
674 # new file: sm
676 # Changes not staged for commit:
677 # (use "git add <file>..." to update what will be committed)
678 # (use "git checkout -- <file>..." to discard changes in working directory)
680 # modified: dir1/modified
682 # Submodule changes to be committed:
684 # * sm 0000000...$head (1):
685 # > Add foo
687 # Untracked files:
688 # (use "git add <file>..." to include in what will be committed)
690 # dir1/untracked
691 # dir2/modified
692 # dir2/untracked
693 # expect
694 # output
695 # untracked
697 test_expect_success 'status submodule summary' '
698 git config status.submodulesummary 10 &&
699 git status >output &&
700 test_cmp expect output
703 cat >expect <<EOF
704 M dir1/modified
705 A dir2/added
706 A sm
707 ?? dir1/untracked
708 ?? dir2/modified
709 ?? dir2/untracked
710 ?? expect
711 ?? output
712 ?? untracked
714 test_expect_success 'status -s submodule summary' '
715 git status -s >output &&
716 test_cmp expect output
719 cat >expect <<EOF
720 # On branch master
721 # Changes not staged for commit:
722 # (use "git add <file>..." to update what will be committed)
723 # (use "git checkout -- <file>..." to discard changes in working directory)
725 # modified: dir1/modified
727 # Untracked files:
728 # (use "git add <file>..." to include in what will be committed)
730 # dir1/untracked
731 # dir2/modified
732 # dir2/untracked
733 # expect
734 # output
735 # untracked
736 no changes added to commit (use "git add" and/or "git commit -a")
738 test_expect_success 'status submodule summary (clean submodule)' '
739 git commit -m "commit submodule" &&
740 git config status.submodulesummary 10 &&
741 test_must_fail git commit --dry-run >output &&
742 test_cmp expect output &&
743 git status >output &&
744 test_cmp expect output
747 cat >expect <<EOF
748 M dir1/modified
749 ?? dir1/untracked
750 ?? dir2/modified
751 ?? dir2/untracked
752 ?? expect
753 ?? output
754 ?? untracked
756 test_expect_success 'status -s submodule summary (clean submodule)' '
757 git status -s >output &&
758 test_cmp expect output
761 cat >expect <<EOF
762 # On branch master
763 # Changes to be committed:
764 # (use "git reset HEAD^1 <file>..." to unstage)
766 # new file: dir2/added
767 # new file: sm
769 # Changes not staged for commit:
770 # (use "git add <file>..." to update what will be committed)
771 # (use "git checkout -- <file>..." to discard changes in working directory)
773 # modified: dir1/modified
775 # Submodule changes to be committed:
777 # * sm 0000000...$head (1):
778 # > Add foo
780 # Untracked files:
781 # (use "git add <file>..." to include in what will be committed)
783 # dir1/untracked
784 # dir2/modified
785 # dir2/untracked
786 # expect
787 # output
788 # untracked
790 test_expect_success 'commit --dry-run submodule summary (--amend)' '
791 git config status.submodulesummary 10 &&
792 git commit --dry-run --amend >output &&
793 test_cmp expect output
796 test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository' '
798 chmod a-w .git &&
799 # make dir1/tracked stat-dirty
800 >dir1/tracked1 && mv -f dir1/tracked1 dir1/tracked &&
801 git status -s >output &&
802 ! grep dir1/tracked output &&
803 # make sure "status" succeeded without writing index out
804 git diff-files | grep dir1/tracked
806 status=$?
807 chmod 775 .git
808 (exit $status)
811 (cd sm && echo > bar && git add bar && git commit -q -m 'Add bar') && git add sm
812 new_head=$(cd sm && git rev-parse --short=7 --verify HEAD)
813 touch .gitmodules
815 cat > expect << EOF
816 # On branch master
817 # Changes to be committed:
818 # (use "git reset HEAD <file>..." to unstage)
820 # modified: sm
822 # Changes not staged for commit:
823 # (use "git add <file>..." to update what will be committed)
824 # (use "git checkout -- <file>..." to discard changes in working directory)
826 # modified: dir1/modified
828 # Submodule changes to be committed:
830 # * sm $head...$new_head (1):
831 # > Add bar
833 # Untracked files:
834 # (use "git add <file>..." to include in what will be committed)
836 # .gitmodules
837 # dir1/untracked
838 # dir2/modified
839 # dir2/untracked
840 # expect
841 # output
842 # untracked
845 test_expect_success '--ignore-submodules=untracked suppresses submodules with untracked content' '
846 echo modified > sm/untracked &&
847 git status --ignore-submodules=untracked > output &&
848 test_cmp expect output
851 test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' '
852 git config diff.ignoreSubmodules dirty &&
853 git status >output &&
854 test_cmp expect output &&
855 git config --add -f .gitmodules submodule.subname.ignore untracked &&
856 git config --add -f .gitmodules submodule.subname.path sm &&
857 git status > output &&
858 test_cmp expect output &&
859 git config -f .gitmodules --remove-section submodule.subname &&
860 git config --unset diff.ignoreSubmodules
863 test_expect_success '.git/config ignore=untracked suppresses submodules with untracked content' '
864 git config --add -f .gitmodules submodule.subname.ignore none &&
865 git config --add -f .gitmodules submodule.subname.path sm &&
866 git config --add submodule.subname.ignore untracked &&
867 git config --add submodule.subname.path sm &&
868 git status > output &&
869 test_cmp expect output &&
870 git config --remove-section submodule.subname &&
871 git config --remove-section -f .gitmodules submodule.subname
874 test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' '
875 git status --ignore-submodules=dirty > output &&
876 test_cmp expect output
879 test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' '
880 git config diff.ignoreSubmodules dirty &&
881 git status >output &&
882 ! test -s actual &&
883 git config --add -f .gitmodules submodule.subname.ignore dirty &&
884 git config --add -f .gitmodules submodule.subname.path sm &&
885 git status > output &&
886 test_cmp expect output &&
887 git config -f .gitmodules --remove-section submodule.subname &&
888 git config --unset diff.ignoreSubmodules
891 test_expect_success '.git/config ignore=dirty suppresses submodules with untracked content' '
892 git config --add -f .gitmodules submodule.subname.ignore none &&
893 git config --add -f .gitmodules submodule.subname.path sm &&
894 git config --add submodule.subname.ignore dirty &&
895 git config --add submodule.subname.path sm &&
896 git status > output &&
897 test_cmp expect output &&
898 git config --remove-section submodule.subname &&
899 git config -f .gitmodules --remove-section submodule.subname
902 test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' '
903 echo modified > sm/foo &&
904 git status --ignore-submodules=dirty > output &&
905 test_cmp expect output
908 test_expect_success '.gitmodules ignore=dirty suppresses submodules with modified content' '
909 git config --add -f .gitmodules submodule.subname.ignore dirty &&
910 git config --add -f .gitmodules submodule.subname.path sm &&
911 git status > output &&
912 test_cmp expect output &&
913 git config -f .gitmodules --remove-section submodule.subname
916 test_expect_success '.git/config ignore=dirty suppresses submodules with modified content' '
917 git config --add -f .gitmodules submodule.subname.ignore none &&
918 git config --add -f .gitmodules submodule.subname.path sm &&
919 git config --add submodule.subname.ignore dirty &&
920 git config --add submodule.subname.path sm &&
921 git status > output &&
922 test_cmp expect output &&
923 git config --remove-section submodule.subname &&
924 git config -f .gitmodules --remove-section submodule.subname
927 cat > expect << EOF
928 # On branch master
929 # Changes to be committed:
930 # (use "git reset HEAD <file>..." to unstage)
932 # modified: sm
934 # Changes not staged for commit:
935 # (use "git add <file>..." to update what will be committed)
936 # (use "git checkout -- <file>..." to discard changes in working directory)
937 # (commit or discard the untracked or modified content in submodules)
939 # modified: dir1/modified
940 # modified: sm (modified content)
942 # Submodule changes to be committed:
944 # * sm $head...$new_head (1):
945 # > Add bar
947 # Untracked files:
948 # (use "git add <file>..." to include in what will be committed)
950 # .gitmodules
951 # dir1/untracked
952 # dir2/modified
953 # dir2/untracked
954 # expect
955 # output
956 # untracked
959 test_expect_success "--ignore-submodules=untracked doesn't suppress submodules with modified content" '
960 git status --ignore-submodules=untracked > output &&
961 test_cmp expect output
964 test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
965 git config --add -f .gitmodules submodule.subname.ignore untracked &&
966 git config --add -f .gitmodules submodule.subname.path sm &&
967 git status > output &&
968 test_cmp expect output &&
969 git config -f .gitmodules --remove-section submodule.subname
972 test_expect_success ".git/config ignore=untracked doesn't suppress submodules with modified content" '
973 git config --add -f .gitmodules submodule.subname.ignore none &&
974 git config --add -f .gitmodules submodule.subname.path sm &&
975 git config --add submodule.subname.ignore untracked &&
976 git config --add submodule.subname.path sm &&
977 git status > output &&
978 test_cmp expect output &&
979 git config --remove-section submodule.subname &&
980 git config -f .gitmodules --remove-section submodule.subname
983 head2=$(cd sm && git commit -q -m "2nd commit" foo && git rev-parse --short=7 --verify HEAD)
985 cat > expect << EOF
986 # On branch master
987 # Changes to be committed:
988 # (use "git reset HEAD <file>..." to unstage)
990 # modified: sm
992 # Changes not staged for commit:
993 # (use "git add <file>..." to update what will be committed)
994 # (use "git checkout -- <file>..." to discard changes in working directory)
996 # modified: dir1/modified
997 # modified: sm (new commits)
999 # Submodule changes to be committed:
1001 # * sm $head...$new_head (1):
1002 # > Add bar
1004 # Submodules changed but not updated:
1006 # * sm $new_head...$head2 (1):
1007 # > 2nd commit
1009 # Untracked files:
1010 # (use "git add <file>..." to include in what will be committed)
1012 # .gitmodules
1013 # dir1/untracked
1014 # dir2/modified
1015 # dir2/untracked
1016 # expect
1017 # output
1018 # untracked
1021 test_expect_success "--ignore-submodules=untracked doesn't suppress submodule summary" '
1022 git status --ignore-submodules=untracked > output &&
1023 test_cmp expect output
1026 test_expect_success ".gitmodules ignore=untracked doesn't suppress submodule summary" '
1027 git config --add -f .gitmodules submodule.subname.ignore untracked &&
1028 git config --add -f .gitmodules submodule.subname.path sm &&
1029 git status > output &&
1030 test_cmp expect output &&
1031 git config -f .gitmodules --remove-section submodule.subname
1034 test_expect_success ".git/config ignore=untracked doesn't suppress submodule summary" '
1035 git config --add -f .gitmodules submodule.subname.ignore none &&
1036 git config --add -f .gitmodules submodule.subname.path sm &&
1037 git config --add submodule.subname.ignore untracked &&
1038 git config --add submodule.subname.path sm &&
1039 git status > output &&
1040 test_cmp expect output &&
1041 git config --remove-section submodule.subname &&
1042 git config -f .gitmodules --remove-section submodule.subname
1045 test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" '
1046 git status --ignore-submodules=dirty > output &&
1047 test_cmp expect output
1049 test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary" '
1050 git config --add -f .gitmodules submodule.subname.ignore dirty &&
1051 git config --add -f .gitmodules submodule.subname.path sm &&
1052 git status > output &&
1053 test_cmp expect output &&
1054 git config -f .gitmodules --remove-section submodule.subname
1057 test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary" '
1058 git config --add -f .gitmodules submodule.subname.ignore none &&
1059 git config --add -f .gitmodules submodule.subname.path sm &&
1060 git config --add submodule.subname.ignore dirty &&
1061 git config --add submodule.subname.path sm &&
1062 git status > output &&
1063 test_cmp expect output &&
1064 git config --remove-section submodule.subname &&
1065 git config -f .gitmodules --remove-section submodule.subname
1068 cat > expect << EOF
1069 # On branch master
1070 # Changes not staged for commit:
1071 # (use "git add <file>..." to update what will be committed)
1072 # (use "git checkout -- <file>..." to discard changes in working directory)
1074 # modified: dir1/modified
1076 # Untracked files:
1077 # (use "git add <file>..." to include in what will be committed)
1079 # .gitmodules
1080 # dir1/untracked
1081 # dir2/modified
1082 # dir2/untracked
1083 # expect
1084 # output
1085 # untracked
1086 no changes added to commit (use "git add" and/or "git commit -a")
1089 test_expect_success "--ignore-submodules=all suppresses submodule summary" '
1090 git status --ignore-submodules=all > output &&
1091 test_cmp expect output
1094 test_expect_failure '.gitmodules ignore=all suppresses submodule summary' '
1095 git config --add -f .gitmodules submodule.subname.ignore all &&
1096 git config --add -f .gitmodules submodule.subname.path sm &&
1097 git status > output &&
1098 test_cmp expect output &&
1099 git config -f .gitmodules --remove-section submodule.subname
1102 test_expect_failure '.git/config ignore=all suppresses submodule summary' '
1103 git config --add -f .gitmodules submodule.subname.ignore none &&
1104 git config --add -f .gitmodules submodule.subname.path sm &&
1105 git config --add submodule.subname.ignore all &&
1106 git config --add submodule.subname.path sm &&
1107 git status > output &&
1108 test_cmp expect output &&
1109 git config --remove-section submodule.subname &&
1110 git config -f .gitmodules --remove-section submodule.subname
1113 test_done