diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2013-09-25 10:36:08 +0400 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-09-25 10:36:08 +0400 |
| commit | 5636a20070c80dec23cc6d6180cb1dd958e23bca (patch) | |
| tree | 78ae41beca656e291696a58addf5a597b2d42018 /t/t7401-submodule-summary.sh | |
| parent | 80f165a58a41ffd37ec24022db8e568bc5165075 (diff) | |
| parent | bb58b696c6ad810560d361b640580715a90382cb (diff) | |
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/t7401-submodule-summary.sh')
| -rwxr-xr-x | t/t7401-submodule-summary.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index 5a6d6d62eb..366746f0d4 100755 --- a/t/t7401-submodule-summary.sh +++ b/t/t7401-submodule-summary.sh @@ -104,6 +104,24 @@ EOF test_cmp expected actual " +test_expect_success 'no ignore=all setting has any effect' " + git config -f .gitmodules submodule.sm1.path sm1 && + git config -f .gitmodules submodule.sm1.ignore all && + git config submodule.sm1.ignore all && + git config diff.ignoreSubmodules all && + git submodule summary >actual && + cat >expected <<-EOF && +* sm1 $head1...$head2 (1): + > Add foo3 + +EOF + test_cmp expected actual && + git config --unset diff.ignoreSubmodules && + git config --remove-section submodule.sm1 && + git config -f .gitmodules --remove-section submodule.sm1 +" + + commit_file sm1 && head3=$( cd sm1 && |