Skip to content

Commit

Permalink
checkout: Add test for diff.ignoreSubmodules
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jens Lehmann authored and Junio C Hamano committed Aug 30, 2010
1 parent 175f6e5 commit 62ed009
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions t/t2013-checkout-submodule.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 62ed009

Please sign in to comment.