Add tests for the diff.ignoreSubmodules config option
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann committed
Aug 6, 2010 at 01:27 UTC
90e14525f22c2980d4375dcb5d79e6d5da293a78
2 files changed
+19
-3
t/t4027-diff-submodule.sh
+9
-1
@@ -115,6 +115,9 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)'
115
'
116
117
test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.git/config]' '
118
+ git config diff.ignoreSubmodules all &&
119
+ git diff HEAD >actual &&
120
+ ! test -s actual &&
121
git config submodule.subname.ignore none &&
122
git config submodule.subname.path sub &&
123
git diff HEAD >actual &&
@@ -136,10 +139,14 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)
139
sed -e "1,/^@@/d" actual >actual.body &&
140
expect_from_to >expect.body $subprev $subprev-dirty &&
141
test_cmp expect.body actual.body &&
139
- git config --remove-section submodule.subname
142
+ git config --remove-section submodule.subname &&
143
+ git config --unset diff.ignoreSubmodules
144
'
145
146
test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]' '
147
+ git config diff.ignoreSubmodules dirty &&
148
+ git diff HEAD >actual &&
149
+ ! test -s actual &&
150
git config --add -f .gitmodules submodule.subname.ignore none &&
151
git config --add -f .gitmodules submodule.subname.path sub &&
152
git diff HEAD >actual &&
@@ -166,6 +173,7 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)
173
test_cmp expect.body actual.body &&
174
git config --remove-section submodule.subname &&
175
git config --remove-section -f .gitmodules submodule.subname &&
176
+ git config --unset diff.ignoreSubmodules &&
177
rm .gitmodules
178
'
179
t/t7508-status.sh
+10
-2
@@ -849,11 +849,15 @@ test_expect_success '--ignore-submodules=untracked suppresses submodules with un
849
'
850
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 &&
856
- git config -f .gitmodules --remove-section submodule.subname
859
+ git config -f .gitmodules --remove-section submodule.subname &&
860
+ git config --unset diff.ignoreSubmodules
861
'
862
863
test_expect_success '.git/config ignore=untracked suppresses submodules with untracked content' '
@@ -873,11 +877,15 @@ test_expect_success '--ignore-submodules=dirty suppresses submodules with untrac
877
'
878
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 &&
880
- git config -f .gitmodules --remove-section submodule.subname
887
+ git config -f .gitmodules --remove-section submodule.subname &&
888
+ git config --unset diff.ignoreSubmodules
889
'
890
891
test_expect_success '.git/config ignore=dirty suppresses submodules with untracked content' '