From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Michael Haggerty <mhagger@alum.mit.edu>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Oct 2012, #01; Tue, 2)
Date: Fri, 5 Oct 2012 20:21:32 +0700 [thread overview]
Message-ID: <20121005132132.GA13591@do> (raw)
In-Reply-To: <7vobki19ax.fsf@alter.siamese.dyndns.org>
On Thu, Oct 04, 2012 at 09:39:02AM -0700, Junio C Hamano wrote:
> Assuming that we do want to match "x/y" with "x/**/y", I suspect
> that "'**' matches anything including a slash" would not give us
> that semantics. Is it something we can easily fix in the wildmatch
> code?
Something like this may suffice. Lightly tested with "git add -n".
Reading the code, I think we can even distinguish "match zero or more
directories" and "match one or more directories" with "/**/" and maybe
"/***/". Right now **, ***, ****... are the same. So are /**/, /***/,
/****/...
-- 8< --
diff --git a/wildmatch.c b/wildmatch.c
index f153f8a..81eadc8 100644
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -98,8 +98,12 @@ static int dowild(const uchar *p, const uchar *text,
continue;
case '*':
if (*++p == '*') {
+ int slashstarstar = p[-2] == '/';
while (*++p == '*') {}
special = TRUE;
+ if (slashstarstar && *p == '/' &&
+ dowild(p + 1, text, a, force_lower_case) == TRUE)
+ return TRUE;
} else
special = FALSE;
if (*p == '\0') {
-- 8< --
--
Duy
next prev parent reply other threads:[~2012-10-05 13:28 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 23:20 What's cooking in git.git (Oct 2012, #01; Tue, 2) Junio C Hamano
2012-10-03 15:23 ` Nguyen Thai Ngoc Duy
2012-10-03 18:17 ` Junio C Hamano
2012-10-04 1:56 ` Nguyen Thai Ngoc Duy
2012-10-04 6:01 ` Junio C Hamano
2012-10-04 7:39 ` [PATCH 0/6] wildmatch part 2 Nguyễn Thái Ngọc Duy
2012-10-04 7:39 ` [PATCH 1/6] attr: remove the union in struct match_attr Nguyễn Thái Ngọc Duy
2012-10-04 7:39 ` [PATCH 2/6] attr: avoid strlen() on every match Nguyễn Thái Ngọc Duy
2012-10-04 7:39 ` [PATCH 3/6] attr: avoid searching for basename " Nguyễn Thái Ngọc Duy
2012-10-04 7:39 ` [PATCH 4/6] attr: more matching optimizations from .gitignore Nguyễn Thái Ngọc Duy
2012-10-04 7:39 ` [PATCH 5/6] gitignore: do not do basename match with patterns that have '**' Nguyễn Thái Ngọc Duy
2012-10-04 17:59 ` Junio C Hamano
2012-10-05 7:01 ` Johannes Sixt
2012-10-05 11:23 ` Nguyen Thai Ngoc Duy
2012-10-04 7:39 ` [PATCH 6/6] t3001: note about expected "**" behavior Nguyễn Thái Ngọc Duy
2012-10-04 18:04 ` Junio C Hamano
2012-10-04 17:43 ` [PATCH 0/6] wildmatch part 2 Junio C Hamano
2012-10-04 9:34 ` What's cooking in git.git (Oct 2012, #01; Tue, 2) Michael Haggerty
2012-10-04 11:46 ` Nguyen Thai Ngoc Duy
2012-10-04 15:17 ` Michael Haggerty
2012-10-04 16:39 ` Junio C Hamano
2012-10-05 12:19 ` Andreas Schwab
2012-10-05 12:30 ` Matthieu Moy
2012-10-05 14:15 ` Andreas Schwab
2012-10-05 13:21 ` Nguyen Thai Ngoc Duy [this message]
2012-10-04 8:17 ` David Michael Barr
2012-10-04 8:30 ` fa/remote-svn (Re: What's cooking in git.git (Oct 2012, #01; Tue, 2)) Jonathan Nieder
2012-10-04 13:16 ` Stephen Bash
2012-10-04 16:30 ` Junio C Hamano
2012-10-04 16:27 ` What's cooking in git.git (Oct 2012, #01; Tue, 2) Junio C Hamano
2012-10-30 12:15 ` Florian Achleitner
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121005132132.GA13591@do \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).