From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH RFC] Convert ce_path_match() use to match_pathspec()
Date: Mon, 25 May 2009 18:42:04 +1000 [thread overview]
Message-ID: <1243240924-5981-1-git-send-email-pclouds@gmail.com> (raw)
Back in history, ce_path_match() was first introduced in commit
fdee7d07ba6c79b3e5125e96adbe1d9c3e75ce1d, in diff-cache.c. It seems
to be used to handle pathspec that we have today. But it did not
support wildcards.
About one year later, match_pathspec() was introduced as match() in
commit 0d78153952e70c21e94dc6b7eefcb2ac5337a902, builtin-add.c. This
version supported wildcards.
For some reasons diff code did not get converted to use
match_pathspec(). So diff commands do not understand wildcards. I was
not here that time to know the reasons. But I find it quite handy to
do "git diff -- '*.sh'", just like the rest of git commands.
Hence this patch, which simply calls match_pathspec() inside
ce_path_match(). With this, "git diff-files" and "git diff-index" now
support wildcards. "git diff-tree" does not because it does not use
ce_path_match().
"git update-index --again" is also affected (in a good way hopefully)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
So.. comments?
read-cache.c | 20 +-------------------
1 files changed, 1 insertions(+), 19 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index 3f58711..d2daf01 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -677,28 +677,10 @@ int ce_same_name(struct cache_entry *a, struct cache_entry *b)
int ce_path_match(const struct cache_entry *ce, const char **pathspec)
{
- const char *match, *name;
- int len;
-
if (!pathspec)
return 1;
- len = ce_namelen(ce);
- name = ce->name;
- while ((match = *pathspec++) != NULL) {
- int matchlen = strlen(match);
- if (matchlen > len)
- continue;
- if (memcmp(name, match, matchlen))
- continue;
- if (matchlen && name[matchlen-1] == '/')
- return 1;
- if (name[matchlen] == '/' || !name[matchlen])
- return 1;
- if (!matchlen)
- return 1;
- }
- return 0;
+ return match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, NULL);
}
/*
--
test
next reply other threads:[~2009-05-25 8:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-25 8:42 Nguyễn Thái Ngọc Duy [this message]
2009-05-25 22:14 ` [PATCH RFC] Convert ce_path_match() use to match_pathspec() Junio C Hamano
2009-05-26 11:04 ` Nguyen Thai Ngoc Duy
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=1243240924-5981-1-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.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).