diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2010-08-28 16:50:07 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-30 00:37:37 -0700 |
| commit | 23b4c7bcc58431beaf9c870a2d6b2ad4fb088a9f (patch) | |
| tree | 3f2414866b1a352f6a7168214d7d6a0e8a11e81a /t | |
| parent | 62ed0096423b098f9736f5397edad8aa7bf50210 (diff) | |
| download | git-23b4c7bcc58431beaf9c870a2d6b2ad4fb088a9f.tar.gz | |
checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
For "git status" and the diff family the submodule.*.ignore settings from
.git/config and .gitmodules can be used to override the default set via
diff.ignoreSubmodules on a per-submodule basis. Let's do this consistently
and teach checkout to use these settings too.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2013-checkout-submodule.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh index 3beb0b3ed7..70edbb33e2 100755 --- a/t/t2013-checkout-submodule.sh +++ b/t/t2013-checkout-submodule.sh @@ -46,4 +46,20 @@ test_expect_success '"checkout <submodule>" honors diff.ignoreSubmodules' ' ! test -s actual ' +test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .gitmodules' ' + git config diff.ignoreSubmodules none && + git config -f .gitmodules submodule.submodule.path submodule && + git config -f .gitmodules submodule.submodule.ignore untracked && + git checkout HEAD >actual 2>&1 && + ! test -s actual +' + +test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .git/config' ' + git config -f .gitmodules submodule.submodule.ignore none && + git config submodule.submodule.path submodule && + git config submodule.submodule.ignore all && + git checkout HEAD >actual 2>&1 && + ! test -s actual +' + test_done |