summaryrefslogtreecommitdiff
path: root/t/t7508-status.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2013-09-25 06:36:08 (GMT)
committerJonathan Nieder <jrnieder@gmail.com>2013-09-25 06:36:08 (GMT)
commit5636a20070c80dec23cc6d6180cb1dd958e23bca (patch)
tree78ae41beca656e291696a58addf5a597b2d42018 /t/t7508-status.sh
parent80f165a58a41ffd37ec24022db8e568bc5165075 (diff)
parentbb58b696c6ad810560d361b640580715a90382cb (diff)
downloadgit-5636a20070c80dec23cc6d6180cb1dd958e23bca.zip
git-5636a20070c80dec23cc6d6180cb1dd958e23bca.tar.gz
git-5636a20070c80dec23cc6d6180cb1dd958e23bca.tar.bz2
Merge branch 'bc/submodule-status-ignored'
* bc/submodule-status-ignored: Improve documentation concerning the status.submodulesummary setting submodule: don't print status output with ignore=all submodule: fix confusing variable name
Diffstat (limited to 't/t7508-status.sh')
-rwxr-xr-xt/t7508-status.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index d8c531d..6fb59f3 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -1380,7 +1380,7 @@ EOF
test_i18ncmp expect output
'
-test_expect_failure '.gitmodules ignore=all suppresses submodule summary' '
+test_expect_success '.gitmodules ignore=all suppresses submodule summary' '
git config --add -f .gitmodules submodule.subname.ignore all &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status > output &&
@@ -1388,7 +1388,7 @@ test_expect_failure '.gitmodules ignore=all suppresses submodule summary' '
git config -f .gitmodules --remove-section submodule.subname
'
-test_expect_failure '.git/config ignore=all suppresses submodule summary' '
+test_expect_success '.git/config ignore=all suppresses submodule summary' '
git config --add -f .gitmodules submodule.subname.ignore none &&
git config --add -f .gitmodules submodule.subname.path sm &&
git config --add submodule.subname.ignore all &&