Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
Documentation/gitignore.txt| 3 +++
attr.c | 4 +++-
dir.c | 5 -
t/t0003-attributes.sh | 17 +
t/t3001-ls-files-others-exclude.sh | 11 +++
5 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index c1f692a..eb81d31 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -93,6 +93,9 @@ PATTERN FORMAT
For example, Documentation/{asterisk}.html matches
Documentation/git.html but not Documentation/ppc/ppc.html
or tools/perf/Documentation/perf.html.
++
+Contrary to fnmatch(3), git matches ** to anything including
+slashes, similar to rsync(1).
- A leading slash matches the beginning of the pathname.
For example, /{asterisk}.c matches cat-file.c but not
diff --git a/attr.c b/attr.c
index b52efb5..15ebaa1 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;
@@ -663,7 +664,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 (ignore_case iwildmatch(pattern, pathname + baselen)) ||
+ (!ignore_case wildmatch(pattern, pathname + baselen));
}
static int macroexpand_one(int attr_nr, int rem);
diff --git a/dir.c b/dir.c
index 240bf0c..92cda82 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;
@@ -573,7 +574,9 @@ int excluded_from_list(const char *pathname,
namelen -= prefix;
}
- if (!namelen || !fnmatch_icase(exclude, name, FNM_PATHNAME))
+ if (!namelen ||
+ ((ignore_case iwildmatch(exclude, name)) ||
+(!ignore_case wildmatch(exclude, name
return to_exclude;
}
return -1; /* undecided */
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index febc45c..6c3c554 100755
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -232,4 +232,21 @@ 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: unspecified
+a/f: foo: bar
+a/b/f: foo: bar
+a/b/c/f: foo: bar
+EOF
+ git check-attr foo -- f actual 2err
+ git check-attr foo -- a/f actual 2err
+ git check-attr foo -- a/b/f actual 2err
+ git check-attr foo -- a/b/c/f actual 2err
+ 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..67c8bcf 100755
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -214,4 +214,15 @@ test_expect_success 'subdirectory ignore (l1)' '
test_cmp expect actual
'
+
+test_expect_success 'ls-files with ** patterns' '
+ cat \EOF expect
+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_done
--
1.7.12.1.406.g6ab07c4
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
