From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Jonathan Niedier <jrnieder@gmail.com>,
tfransosi@gmail.com
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 5/5] Revert "excluded_1(): support exclude files in index"
Date: Sat, 27 Nov 2010 01:17:47 +0700 [thread overview]
Message-ID: <1290795467-7570-6-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1290795467-7570-1-git-send-email-pclouds@gmail.com>
This reverts commit c84de70781674a35b9bfd20aa5bc8c47582615df.
The commit provided a workaround for matching directories in
index. But it is no longer needed.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
dir.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/dir.c b/dir.c
index 39eb7a3..d059aa1 100644
--- a/dir.c
+++ b/dir.c
@@ -371,13 +371,6 @@ int excluded_from_list(const char *pathname,
int to_exclude = x->to_exclude;
if (x->flags & EXC_FLAG_MUSTBEDIR) {
- if (!dtype) {
- if (!prefixcmp(pathname, exclude) &&
- pathname[x->patternlen] == '/')
- return to_exclude;
- else
- continue;
- }
if (*dtype == DT_UNKNOWN)
*dtype = get_dtype(NULL, pathname, pathlen);
if (*dtype != DT_DIR)
--
1.7.3.2.316.gda8b3
prev parent reply other threads:[~2010-11-26 18:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-26 18:17 [PATCH 0/5] Sparse checkout fixes Nguyễn Thái Ngọc Duy
2010-11-26 18:17 ` [PATCH 1/5] cache.h: remove surrounding brackes and realign CE_* constants Nguyễn Thái Ngọc Duy
2010-11-26 19:20 ` Thiago Farina
2010-11-27 6:22 ` [PATCH 1/5] cache.h: realign and use (1 << x) form for " Nguyễn Thái Ngọc Duy
2010-11-26 18:17 ` [PATCH 2/5] dir.c: add free_excludes() Nguyễn Thái Ngọc Duy
2010-11-26 18:17 ` [PATCH 3/5] unpack-trees: move all skip-worktree checks back to unpack_trees() Nguyễn Thái Ngọc Duy
2010-11-27 6:24 ` Nguyễn Thái Ngọc Duy
2010-11-26 18:17 ` [PATCH 4/5] unpack-trees: fix sparse checkout's "unable to match directories" Nguyễn Thái Ngọc Duy
2010-11-26 18:17 ` Nguyễn Thái Ngọc Duy [this message]
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=1290795467-7570-6-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=tfransosi@gmail.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).