From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Jeff King <peff@peff.net>,
Michael J Gruber <git@drmicha.warpmail.net>,
Jon Schewe <jpschewe@mtu.net>,
spearce@spearce.org
Subject: [PATCH 1/4] t3001: test ls-files -o ignored/dir
Date: Fri, 8 Jan 2010 23:35:32 -0800 [thread overview]
Message-ID: <1263022535-12822-1-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <7veilzaguf.fsf@alter.siamese.dyndns.org>
When you have "t" directory that is marked as ignored in the top-level
.gitignore file (or $GIT_DIR/info/exclude), running
$ git ls-files -o --exclude-standard
from the top-level correctly excludes files in "t" directory, but
any of the following:
$ git ls-files -o --exclude-standard t/
$ cd t && git ls-files -o --exclude-standard
would show untracked files in that directory.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
t/t3001-ls-files-others-exclude.sh | 39 ++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index c65bca8..e3e4d71 100755
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -153,4 +153,43 @@ test_expect_success 'negated exclude matches can override previous ones' '
grep "^a.1" output
'
+test_expect_success 'subdirectory ignore (setup)' '
+ mkdir -p top/l1/l2 &&
+ (
+ cd top &&
+ git init &&
+ echo /.gitignore >.gitignore &&
+ echo l1 >>.gitignore &&
+ echo l2 >l1/.gitignore &&
+ >l1/l2/l1
+ )
+'
+
+test_expect_success 'subdirectory ignore (toplevel)' '
+ (
+ cd top &&
+ git ls-files -o --exclude-standard
+ ) >actual &&
+ >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'subdirectory ignore (l1/l2)' '
+ (
+ cd top/l1/l2 &&
+ git ls-files -o --exclude-standard
+ ) >actual &&
+ >expect &&
+ test_cmp expect actual
+'
+
+test_expect_failure 'subdirectory ignore (l1)' '
+ (
+ cd top/l1 &&
+ git ls-files -o --exclude-standard
+ ) >actual &&
+ >expect &&
+ test_cmp expect actual
+'
+
test_done
--
1.6.6.209.g52296.dirty
next prev parent reply other threads:[~2010-01-09 7:36 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-08 15:17 Possible bug in git-completion.sh Jon Schewe
2010-01-08 15:40 ` Michael J Gruber
2010-01-08 16:24 ` Jeff King
2010-01-08 16:38 ` Junio C Hamano
2010-01-08 16:41 ` Jeff King
2010-01-08 16:45 ` Junio C Hamano
2010-01-08 16:56 ` Junio C Hamano
2010-01-08 17:24 ` Jeff King
2010-01-08 17:21 ` Jeff King
2010-01-08 18:21 ` Junio C Hamano
2010-01-08 19:58 ` Junio C Hamano
2010-01-08 23:01 ` [PATCH] ls-files: fix overeager pathspec optimization Junio C Hamano
2010-01-08 23:24 ` Linus Torvalds
2010-01-08 23:31 ` Junio C Hamano
2010-01-09 0:06 ` Junio C Hamano
2010-01-09 0:24 ` Linus Torvalds
2010-01-09 0:54 ` Junio C Hamano
2010-01-09 1:07 ` Linus Torvalds
2010-01-09 5:42 ` Jeff King
2010-01-09 7:16 ` Junio C Hamano
2010-01-09 7:35 ` Junio C Hamano [this message]
2010-01-09 7:35 ` [PATCH 2/4] read_directory_recursive(): refactor handling of a single path into a separate function Junio C Hamano
2010-01-09 7:35 ` [PATCH 3/4] read_directory(): further split treat_path() Junio C Hamano
2010-01-09 7:35 ` [PATCH 4/4] ls-files: fix overeager pathspec optimization Junio C Hamano
2010-01-12 16:33 ` Jeff King
2010-01-09 8:07 ` [PATCH] " Junio C Hamano
2010-01-09 18:05 ` Linus Torvalds
2010-01-10 6:31 ` 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=1263022535-12822-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=jpschewe@mtu.net \
--cc=peff@peff.net \
--cc=spearce@spearce.org \
--cc=torvalds@linux-foundation.org \
/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).