diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2010-03-14 01:00:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-14 08:56:35 +0300 |
| commit | 3bfc45047654c7dd38b32033321228e97fc8f60e (patch) | |
| tree | 6899c722253819b7d29aa7abb7e0ac7716fa9079 /t/t7506-status-submodule.sh | |
| parent | 85adbf2f751a91429de6b431c45737ba9d7e9e00 (diff) | |
git status: ignoring untracked files must apply to submodules too
Since 1.7.0 submodules are considered dirty when they contain untracked
files. But when git status is called with the "-uno" option, the user
asked to ignore untracked files, so they must be ignored in submodules
too. To achieve this, the new flag DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES
is introduced.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7506-status-submodule.sh')
| -rwxr-xr-x | t/t7506-status-submodule.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh index dc9150a71f..aeec1f6142 100755 --- a/t/t7506-status-submodule.sh +++ b/t/t7506-status-submodule.sh @@ -67,6 +67,11 @@ test_expect_success 'status with untracked file in submodule' ' grep "modified: sub (untracked content)" output ' +test_expect_success 'status -uno with untracked file in submodule' ' + git status -uno >output && + grep "^nothing to commit" output +' + test_expect_success 'status with untracked file in submodule (porcelain)' ' git status --porcelain >output && diff output - <<-\EOF |