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 12/16] narrow spec: put '+' before a spec will change semantic of '*'
Date: Sun, 14 Sep 2008 20:08:01 +0700 [thread overview]
Message-ID: <1221397685-27715-13-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1221397685-27715-12-git-send-email-pclouds@gmail.com>
Previously '*' in narrow spec means 'match everything, even slashes'.
With this change, '*' is now 'match everything except slashes' so it is
more like shell wildcard one. Putting '+' before a spec will make
'*' as powerful as before.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
unpack-trees.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 968cc98..3782de6 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -812,10 +812,15 @@ int match_narrow_spec(const char *spec_, const char *path, const char *prefix)
while (!match) {
char *next_spec = strchr(cur_spec, ':');
+ int flag = 0;
if (next_spec)
*next_spec = '\0';
- if (!fnmatch(cur_spec, path+prefix_len, 0))
+ if (*cur_spec == '+')
+ cur_spec++;
+ else
+ flag = FNM_PATHNAME;
+ if (!fnmatch(cur_spec, path+prefix_len, flag))
match = 1;
if (!next_spec)
--
1.6.0.96.g2fad1.dirty
next prev parent reply other threads:[~2008-09-14 13:10 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-14 13:07 [PATCH 00/16] Narrow/Partial/Sparse checkout Nguyễn Thái Ngọc Duy
2008-09-14 13:07 ` [PATCH 01/16] Extend index to save more flags Nguyễn Thái Ngọc Duy
2008-09-14 13:07 ` [PATCH 02/16] Introduce CE_NO_CHECKOUT bit Nguyễn Thái Ngọc Duy
2008-09-14 13:07 ` [PATCH 03/16] update-index: refactor mark_valid() in preparation for new options Nguyễn Thái Ngọc Duy
2008-09-14 13:07 ` [PATCH 04/16] update-index: add --checkout/--no-checkout to update CE_NO_CHECKOUT bit Nguyễn Thái Ngọc Duy
2008-09-14 13:07 ` [PATCH 05/16] ls-files: add --narrow-checkout option to "will checkout" entries Nguyễn Thái Ngọc Duy
2008-09-14 13:07 ` [PATCH 06/16] Add tests for updating no-checkout entries in index Nguyễn Thái Ngọc Duy
2008-09-14 13:07 ` [PATCH 07/16] Prevent diff machinery from examining worktree outside narrow checkout Nguyễn Thái Ngọc Duy
2008-09-14 13:07 ` [PATCH 08/16] checkout_entry(): CE_NO_CHECKOUT on checked out entries Nguyễn Thái Ngọc Duy
2008-09-14 13:07 ` [PATCH 09/16] ls-files: apply --deleted on narrow area only Nguyễn Thái Ngọc Duy
2008-09-14 13:07 ` [PATCH 10/16] grep: skip files that have not been checked out Nguyễn Thái Ngọc Duy
2008-09-14 13:08 ` [PATCH 11/16] unpack_trees(): add support for narrow checkout Nguyễn Thái Ngọc Duy
2008-09-14 13:08 ` Nguyễn Thái Ngọc Duy [this message]
2008-09-14 13:08 ` [PATCH 13/16] ls-files: add --narrow-match=spec option for testing narrow matching Nguyễn Thái Ngọc Duy
2008-09-14 13:08 ` [PATCH 14/16] clone: support narrow checkout with --path option Nguyễn Thái Ngọc Duy
2008-09-14 13:08 ` [PATCH 15/16] checkout: add new options to support narrow checkout Nguyễn Thái Ngọc Duy
2008-09-14 13:08 ` [PATCH 16/16] ls-files: add --overlay option Nguyễn Thái Ngọc Duy
2008-09-14 21:10 ` Jakub Narebski
2008-09-15 19:35 ` Junio C Hamano
2008-09-16 12:00 ` Nguyen Thai Ngoc Duy
2008-09-16 17:00 ` Junio C Hamano
2008-09-14 21:12 ` [PATCH 15/16] checkout: add new options to support narrow checkout Jakub Narebski
2008-09-16 9:53 ` Baz
2008-09-16 10:17 ` Johannes Sixt
2008-09-16 13:13 ` Nguyen Thai Ngoc Duy
2008-09-14 19:01 ` [PATCH 14/16] clone: support narrow checkout with --path option Jakub Narebski
2008-09-15 20:27 ` Junio C Hamano
2008-09-14 18:58 ` [PATCH 13/16] ls-files: add --narrow-match=spec option for testing narrow matching Jakub Narebski
2008-09-15 19:34 ` [PATCH 11/16] unpack_trees(): add support for narrow checkout Junio C Hamano
2008-09-16 11:45 ` Nguyen Thai Ngoc Duy
2008-09-14 18:56 ` [PATCH 10/16] grep: skip files that have not been checked out Jakub Narebski
2008-09-15 19:35 ` [PATCH 09/16] ls-files: apply --deleted on narrow area only Junio C Hamano
2008-09-14 18:55 ` [PATCH 05/16] ls-files: add --narrow-checkout option to "will checkout" entries Jakub Narebski
2008-09-15 20:20 ` Junio C Hamano
2008-09-14 18:50 ` [PATCH 04/16] update-index: add --checkout/--no-checkout to update CE_NO_CHECKOUT bit Jakub Narebski
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=1221397685-27715-13-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).