diff options
| author |  Jens Lehmann <Jens.Lehmann@web.de> | 2010-08-28 16:49:25 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-30 00:37:30 -0700 |
| commit | 62ed0096423b098f9736f5397edad8aa7bf50210 (patch) | |
| tree | 7be53d34b8eb9f7728dcaff33b45f35dfc57bbc1 | |
| parent | checkout: respect diff.ignoreSubmodules setting (diff) | |
| download | tgif-62ed0096423b098f9736f5397edad8aa7bf50210.tar.xz | |
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>
| -rw-r--r-- | Documentation/config.txt | 3 | ||||
| -rwxr-xr-x | t/t2013-checkout-submodule.sh | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index cf5562192d..01b7e0ae6c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -829,7 +829,8 @@ diff.renames:: diff.ignoreSubmodules:: Sets the default value of --ignore-submodules. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' - commands such as 'git diff-files'. + commands such as 'git diff-files'. 'git checkout' also honors + this setting when reporting uncommitted changes. diff.suppressBlankEmpty:: A boolean to inhibit the standard behavior of printing a space 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 |