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>

diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 1bc6e77a0d5914a7cbf0986bdabc44697e334c27..d99814ac641c93383d7199f4419083bedcfc9ea8 100755 (executable)
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -115,6 +115,9 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)'
 '
 
 test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.git/config]' '
 '
 
 test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.git/config]' '

+       git config diff.ignoreSubmodules all &&
+       git diff HEAD >actual &&
+       ! test -s actual &&

        git config submodule.subname.ignore none &&
        git config submodule.subname.path sub &&
        git diff HEAD >actual &&
        git config submodule.subname.ignore none &&
        git config submodule.subname.path sub &&
        git diff HEAD >actual &&


@@ -136,10 +139,14 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)
        sed -e "1,/^@@/d" actual >actual.body &&
        expect_from_to >expect.body $subprev $subprev-dirty &&
        test_cmp expect.body actual.body &&
        sed -e "1,/^@@/d" actual >actual.body &&
        expect_from_to >expect.body $subprev $subprev-dirty &&
        test_cmp expect.body actual.body &&

-       git config --remove-section submodule.subname
+       git config --remove-section submodule.subname &&
+       git config --unset diff.ignoreSubmodules

 '
 
 test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]' '
 '
 
 test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]' '

+       git config diff.ignoreSubmodules dirty &&
+       git diff HEAD >actual &&
+       ! test -s actual &&

        git config --add -f .gitmodules submodule.subname.ignore none &&
        git config --add -f .gitmodules submodule.subname.path sub &&
        git diff HEAD >actual &&
        git config --add -f .gitmodules submodule.subname.ignore none &&
        git config --add -f .gitmodules submodule.subname.path sub &&
        git diff HEAD >actual &&


@@ -166,6 +173,7 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)
        test_cmp expect.body actual.body &&
        git config --remove-section submodule.subname &&
        git config --remove-section -f .gitmodules submodule.subname &&
        test_cmp expect.body actual.body &&
        git config --remove-section submodule.subname &&
        git config --remove-section -f .gitmodules submodule.subname &&

+       git config --unset diff.ignoreSubmodules &&

        rm .gitmodules
 '
 
        rm .gitmodules
 '
 

diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 1aae7626155f128342a38ba5471e8c01b89fbd9d..9c14b853c07f26722953c8a1f778a41af8808cf1 100755 (executable)
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -849,11 +849,15 @@ test_expect_success '--ignore-submodules=untracked suppresses submodules with un
 '
 
 test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' '
 '
 
 test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' '

+       git config diff.ignoreSubmodules dirty &&
+       git status >output &&
+       test_cmp expect output &&

        git config --add -f .gitmodules submodule.subname.ignore untracked &&
        git config --add -f .gitmodules submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&
        git config --add -f .gitmodules submodule.subname.ignore untracked &&
        git config --add -f .gitmodules submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&

-       git config -f .gitmodules  --remove-section submodule.subname
+       git config -f .gitmodules  --remove-section submodule.subname &&
+       git config --unset diff.ignoreSubmodules

 '
 
 test_expect_success '.git/config ignore=untracked suppresses submodules with untracked content' '
 '
 
 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
 '
 
 test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' '
 '
 
 test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' '

+       git config diff.ignoreSubmodules dirty &&
+       git status >output &&
+       ! test -s actual &&

        git config --add -f .gitmodules submodule.subname.ignore dirty &&
        git config --add -f .gitmodules submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&
        git config --add -f .gitmodules submodule.subname.ignore dirty &&
        git config --add -f .gitmodules submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&

-       git config -f .gitmodules  --remove-section submodule.subname
+       git config -f .gitmodules  --remove-section submodule.subname &&
+       git config --unset diff.ignoreSubmodules

 '
 
 test_expect_success '.git/config ignore=dirty suppresses submodules with untracked content' '
 '
 
 test_expect_success '.git/config ignore=dirty suppresses submodules with untracked content' '