diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:54 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:54 +0900 |
| commit | 21deee3cabce7d58c50992f57a224e52187a1d26 (patch) | |
| tree | 02919a42ce50eb8c43d22264fc2cb141a2101a7c /t | |
| parent | a9749b0b785c2ccf245835d9a8426fa28c62005e (diff) | |
| parent | fadb4820c4a0178ce76c24d7b48b7ea70210727a (diff) | |
| download | git-21deee3cabce7d58c50992f57a224e52187a1d26.tar.gz | |
Merge branch 'js/submodule-in-excluded' into maint
"git status --ignored -u" did not stop at a working tree of a
separate project that is embedded in an ignored directory and
listed files in that other project, instead of just showing the
directory itself as ignored.
* js/submodule-in-excluded:
status: do not get confused by submodules in excluded directories
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7061-wtstatus-ignore.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh index fc6013ba3c..0c394cf995 100755 --- a/t/t7061-wtstatus-ignore.sh +++ b/t/t7061-wtstatus-ignore.sh @@ -272,4 +272,15 @@ test_expect_success 'status ignored tracked directory with uncommitted file in t test_cmp expected actual ' +cat >expected <<\EOF +!! tracked/submodule/ +EOF + +test_expect_success 'status ignores submodule in excluded directory' ' + git init tracked/submodule && + test_commit -C tracked/submodule initial && + git status --porcelain --ignored -u tracked/submodule >actual && + test_cmp expected actual +' + test_done |