diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-11-06 13:11:26 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 13:11:26 +0900 |
| commit | da7996aaf75fcd58c0fb787c15ee9569140a2f9c (patch) | |
| tree | d7f70aca35d260f801e61976e53a90ad6a7350e4 /t | |
| parent | Merge branch 'ao/check-resolve-ref-unsafe-result' (diff) | |
| parent | status: do not get confused by submodules in excluded directories (diff) | |
| download | tgif-da7996aaf75fcd58c0fb787c15ee9569140a2f9c.tar.xz | |
Merge branch 'js/submodule-in-excluded'
"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 |