From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Michael Haggerty" <mhagger@alum.mit.edu>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v4 11/12] Support "**" wildcard in .gitignore and .gitattributes
Date: Wed, 10 Oct 2012 17:40:50 +0700 [thread overview]
Message-ID: <1349865651-31889-12-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1349865651-31889-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Documentation/gitattributes.txt | 6 ++++++
Documentation/gitignore.txt | 19 +++++++++++++++++++
attr.c | 4 +++-
dir.c | 4 +++-
t/t0003-attributes.sh | 38 ++++++++++++++++++++++++++++++++++++++
t/t3001-ls-files-others-exclude.sh | 19 +++++++++++++++++++
6 files changed, 88 insertions(+), 2 deletions(-)
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 99ed04d..93c542b 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -57,6 +57,12 @@ overrides an earlier line. This overriding is done per
attribute. The rules how the pattern matches paths are the
same as in `.gitignore` files; see linkgit:gitignore[5].
+Note that if a .gitignore rule matches a directory, the directory
+is ignored, which may be seen as "ignore" attribute propagated to
+to all files and directories inside. If a .gitattributes rule
+matches a directory, it manipulates attributes on that directory
+only, not files and directories inside.
+
When deciding what attributes are assigned to a path, git
consults `$GIT_DIR/info/attributes` file (which has the highest
precedence), `.gitattributes` file in the same directory as the
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 96639e0..b564b4b 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -104,6 +104,25 @@ PATTERN FORMAT
For example, "/{asterisk}.c" matches "cat-file.c" but not
"mozilla-sha1/sha1.c".
+Two consecutive asterisks ("`**`") in patterns matched against
+full pathname may have special meaning:
+
+ - A leading "`**`" followed by a slash means match in all
+ directories. For example, "`**/foo`" matches file or directory
+ "`foo`" anywhere, the same as pattern "`foo`". "**/foo/bar"
+ matches file or directory "`bar`" anywhere that is directly
+ under directory "`foo`".
+
+ - A trailing "/**" matches everything inside. For example,
+ "abc/**" matches all files inside directory "abc", relative
+ to the location of the `.gitignore` file, with infinite depth.
+
+ - A slash followed by two consecutive asterisks then a slash
+ matches zero or more directories. For example, "`a/**/b`"
+ matches "`a/b`", "`a/x/b`", "`a/x/y/b`" and so on.
+
+ - Other consecutive asterisks are considered invalid.
+
NOTES
-----
diff --git a/attr.c b/attr.c
index 887a9ae..8010429 100644
--- a/attr.c
+++ b/attr.c
@@ -12,6 +12,7 @@
#include "exec_cmd.h"
#include "attr.h"
#include "dir.h"
+#include "wildmatch.h"
const char git_attr__true[] = "(builtin)true";
const char git_attr__false[] = "\0(builtin)false";
@@ -666,7 +667,8 @@ static int path_matches(const char *pathname, int pathlen,
return 0;
if (baselen != 0)
baselen++;
- return fnmatch_icase(pattern, pathname + baselen, FNM_PATHNAME) == 0;
+ return wildmatch(pattern, pathname + baselen,
+ ignore_case ? FNM_CASEFOLD : 0) == 0;
}
static int macroexpand_one(int attr_nr, int rem);
diff --git a/dir.c b/dir.c
index 4868339..442db1c 100644
--- a/dir.c
+++ b/dir.c
@@ -8,6 +8,7 @@
#include "cache.h"
#include "dir.h"
#include "refs.h"
+#include "wildmatch.h"
struct path_simplify {
int len;
@@ -575,7 +576,8 @@ int excluded_from_list(const char *pathname,
namelen -= prefix;
}
- if (!namelen || !fnmatch_icase(exclude, name, FNM_PATHNAME))
+ if (!namelen ||
+ wildmatch(exclude, name, ignore_case ? FNM_CASEFOLD : 0) == 0)
return to_exclude;
}
return -1; /* undecided */
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index febc45c..67a5694 100755
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -232,4 +232,42 @@ test_expect_success 'bare repository: test info/attributes' '
attr_check subdir/a/i unspecified
'
+test_expect_success '"**" test' '
+ cd .. &&
+ echo "**/f foo=bar" >.gitattributes &&
+ cat <<\EOF >expect &&
+f: foo: bar
+a/f: foo: bar
+a/b/f: foo: bar
+a/b/c/f: foo: bar
+EOF
+ git check-attr foo -- "f" >actual 2>err &&
+ git check-attr foo -- "a/f" >>actual 2>>err &&
+ git check-attr foo -- "a/b/f" >>actual 2>>err &&
+ git check-attr foo -- "a/b/c/f" >>actual 2>>err &&
+ test_cmp expect actual &&
+ test_line_count = 0 err
+'
+
+test_expect_success '"**" with no slashes test' '
+ echo "a**f foo=bar" >.gitattributes &&
+ git check-attr foo -- "f" >actual &&
+ cat <<\EOF >expect &&
+f: foo: unspecified
+af: foo: bar
+axf: foo: bar
+a/f: foo: unspecified
+a/b/f: foo: unspecified
+a/b/c/f: foo: unspecified
+EOF
+ git check-attr foo -- "f" >actual 2>err &&
+ git check-attr foo -- "af" >>actual 2>err &&
+ git check-attr foo -- "axf" >>actual 2>err &&
+ git check-attr foo -- "a/f" >>actual 2>>err &&
+ git check-attr foo -- "a/b/f" >>actual 2>>err &&
+ git check-attr foo -- "a/b/c/f" >>actual 2>>err &&
+ test_cmp expect actual &&
+ test_line_count = 0 err
+'
+
test_done
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index c8fe978..278315d 100755
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -214,4 +214,23 @@ test_expect_success 'subdirectory ignore (l1)' '
test_cmp expect actual
'
+
+test_expect_success 'ls-files with "**" patterns' '
+ cat <<\EOF >expect &&
+a.1
+one/a.1
+one/two/a.1
+three/a.1
+EOF
+ git ls-files -o -i --exclude "**/a.1" >actual
+ test_cmp expect actual
+'
+
+
+test_expect_success 'ls-files with "**" patterns and no slashes' '
+ : >expect &&
+ git ls-files -o -i --exclude "one**a.1" >actual &&
+ test_cmp expect actual
+'
+
test_done
--
1.7.12.1.406.g6ab07c4
next prev parent reply other threads:[~2012-10-10 10:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-10 10:40 [PATCH v4 00/12] Wildmatch v4 Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 01/12] ctype: make sane_ctype[] const array Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 02/12] ctype: support iscntrl, ispunct, isxdigit and isprint Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 03/12] Import wildmatch from rsync Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 04/12] wildmatch: remove unnecessary functions Nguyễn Thái Ngọc Duy
2012-10-10 15:38 ` Michael Haggerty
2012-10-10 10:40 ` [PATCH v4 05/12] Integrate wildmatch to git Nguyễn Thái Ngọc Duy
2012-10-12 7:27 ` Johannes Sixt
2012-10-12 17:30 ` Junio C Hamano
2012-10-10 10:40 ` [PATCH v4 06/12] wildmatch: make wildmatch's return value compatible with fnmatch Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 07/12] wildmatch: remove static variable force_lower_case Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 08/12] wildmatch: fix case-insensitive matching Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 09/12] wildmatch: adjust "**" behavior Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 10/12] wildmatch: make /**/ match zero or more directories Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` Nguyễn Thái Ngọc Duy [this message]
2012-10-10 10:40 ` [PATCH v4 12/12] t3070: disable two fnmatch tests that have different results on different libc Nguyễn Thái Ngọc Duy
2012-10-12 7:22 ` Johannes Sixt
2012-10-12 9:49 ` Nguyen Thai Ngoc Duy
2012-10-10 23:48 ` [PATCH v4 00/12] Wildmatch v4 Junio C Hamano
2012-10-11 4:33 ` Junio C Hamano
2012-10-11 11:56 ` Nguyen Thai Ngoc Duy
2012-10-11 16:09 ` Junio C Hamano
2012-10-11 17:09 ` Junio C Hamano
2012-10-11 23:50 ` Junio C Hamano
2012-10-12 16:44 ` Torsten Bögershausen
2012-10-12 17:05 ` Junio C Hamano
2012-10-12 20:28 ` Torsten Bögershausen
2012-10-13 3:49 ` 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
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=1349865651-31889-12-git-send-email-pclouds@gmail.com \
--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).