[PATCH v2 0/1] Do not handle submodules in excluded directories as untracked
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Oct 25, 2017, 20:40 UTC
- Message-ID
- <cover.1508964005.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <244d71f47336e985ae265573b7d523cd8b3943bd.1508244305.git.johannes.schindelin@gmx.de>
Anything in an excluded directory should be ignored, not only files and directories but also submodules.
Changes since v1:
- simplified the test case, as suggested by Kevin
- added explicit output to the commit message to demonstrate what is fixed
Johannes Schindelin (1): status: do not get confused by submodules in excluded directories
dir.c | 2 +- t/t7061-wtstatus-ignore.sh | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)
base-commit: ba78f398be65e941b93276680f68a81075716472 Published-As: https://github.com/dscho/git/releases/tag/submodule-in-excluded-v2 Fetch-It-Via: git fetch https://github.com/dscho/git submodule-in-excluded-v2
Interdiff vs v1: diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh index 8c849a4cd2f..0c394cf995c 100755 --- a/t/t7061-wtstatus-ignore.sh +++ b/t/t7061-wtstatus-ignore.sh @@ -278,10 +278,7 @@ EOF test_expect_success 'status ignores submodule in excluded directory' ' git init tracked/submodule && - ( - cd tracked/submodule && - test_commit initial - ) && + test_commit -C tracked/submodule initial && git status --porcelain --ignored -u tracked/submodule >actual && test_cmp expected actual '
-- 2.14.3.windows.1