From 62ed0096423b098f9736f5397edad8aa7bf50210 Mon Sep 17 00:00:00 2001 From: Jens Lehmann Date: Sat, 28 Aug 2010 16:49:25 +0200 Subject: checkout: Add test for diff.ignoreSubmodules While at it, document that checkout uses this flag too in the Documentation. Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano --- t/t2013-checkout-submodule.sh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 't') diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh index fda3f0af7..3beb0b3ed 100755 --- a/t/t2013-checkout-submodule.sh +++ b/t/t2013-checkout-submodule.sh @@ -39,4 +39,11 @@ test_expect_success '"checkout " updates the index only' ' git diff-files --quiet ' +test_expect_success '"checkout " honors diff.ignoreSubmodules' ' + git config diff.ignoreSubmodules dirty && + echo x> submodule/untracked && + git checkout HEAD >actual 2>&1 && + ! test -s actual +' + test_done -- cgit v1.2.1 From 23b4c7bcc58431beaf9c870a2d6b2ad4fb088a9f Mon Sep 17 00:00:00 2001 From: Jens Lehmann Date: Sat, 28 Aug 2010 16:50:07 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- t/t2013-checkout-submodule.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 't') diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh index 3beb0b3ed..70edbb33e 100755 --- a/t/t2013-checkout-submodule.sh +++ b/t/t2013-checkout-submodule.sh @@ -46,4 +46,20 @@ test_expect_success '"checkout " honors diff.ignoreSubmodules' ' ! test -s actual ' +test_expect_success '"checkout " 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 " 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 -- cgit v1.2.1