From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Kevin Daudt <me@ikke.info>,
Heiko Voigt <hvoigt@hvoigt.net>,
Stefan Beller <sbeller@google.com>
Subject: [PATCH v2 0/1] Do not handle submodules in excluded directories as untracked
Date: Wed, 25 Oct 2017 22:40:36 +0200 (CEST) [thread overview]
Message-ID: <cover.1508964005.git.johannes.schindelin@gmx.de> (raw)
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
next prev parent reply other threads:[~2017-10-25 20:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-17 13:10 [PATCH] status: do not get confused by submodules in excluded directories Johannes Schindelin
2017-10-24 5:18 ` Junio C Hamano
2017-10-24 12:15 ` Heiko Voigt
2017-10-24 15:34 ` Stefan Beller
2017-10-25 1:28 ` Junio C Hamano
2017-10-25 14:04 ` Heiko Voigt
2017-10-25 20:39 ` Johannes Schindelin
2017-10-24 8:20 ` Kevin Daudt
2017-10-25 13:26 ` Johannes Schindelin
2017-10-25 20:40 ` Johannes Schindelin [this message]
2017-10-25 20:40 ` [PATCH v2 1/1] " Johannes Schindelin
2017-10-26 2:28 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1508964005.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=me@ikke.info \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).