summaryrefslogtreecommitdiff
path: root/t/t2013-checkout-submodule.sh
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2010-08-28 16:49:25 +0200
committerJunio C Hamano <gitster@pobox.com>2010-08-30 00:37:30 -0700
commit62ed0096423b098f9736f5397edad8aa7bf50210 (patch)
tree7be53d34b8eb9f7728dcaff33b45f35dfc57bbc1 /t/t2013-checkout-submodule.sh
parent175f6e59f6c74d5f8c80fe3a6678915cc5d35cb6 (diff)
downloadgit-62ed0096423b098f9736f5397edad8aa7bf50210.tar.gz
checkout: Add test for diff.ignoreSubmodules
While at it, document that checkout uses this flag too in the Documentation. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2013-checkout-submodule.sh')
-rwxr-xr-xt/t2013-checkout-submodule.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh
index fda3f0af7e..3beb0b3ed7 100755
--- a/t/t2013-checkout-submodule.sh
+++ b/t/t2013-checkout-submodule.sh
@@ -39,4 +39,11 @@ test_expect_success '"checkout <submodule>" updates the index only' '
git diff-files --quiet
'
+test_expect_success '"checkout <submodule>" honors diff.ignoreSubmodules' '
+ git config diff.ignoreSubmodules dirty &&
+ echo x> submodule/untracked &&
+ git checkout HEAD >actual 2>&1 &&
+ ! test -s actual
+'
+
test_done