mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bc/submodule-status-ignored'

Browse Source 
* 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
This commit is contained in:
Jonathan Nieder
2013-09-24 23:36:08 -07:00
parent 80f165a58a bb58b696c6
commit 5636a20070
7 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
t/t7401-submodule-summary.sh
View File

@ -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 &&