[PATCH 5/6] gitignore: do not do basename match with patterns that have '**'
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Oct 4, 2012, 07:39 UTC
- Message-ID
- <1349336392-1772-6-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1349336392-1772-1-git-send-email-pclouds@gmail.com>
"**" can match slashes, not like "*". "ab**ef" should be able to match "ab/cd/ef", or "ab/c/d/ef" and so on. Turn off the EXC_FLAG_NODIR in this case otherwise the pattern is only checked against the base name. This behavior is in sync with rsync.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- Documentation/gitignore.txt | 10 +++++----- attr.c | 2 +- dir.c | 2 +- t/t0003-attributes.sh | 16 ++++++++++++++++ t/t3001-ls-files-others-exclude.sh | 10 ++++++++++ 5 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index eb81d31..4dfe8bd 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -81,11 +81,11 @@ PATTERN FORMAT regular file or a symbolic link `foo` (this is consistent with the way how pathspec works in general in git). - - If the pattern does not contain a slash '/', git treats it as - a shell glob pattern and checks for a match against the - pathname relative to the location of the `.gitignore` file - (relative to the toplevel of the work tree if not from a - `.gitignore` file). + - If the pattern does not contain a slash '/' nor '**', git + treats it as a shell glob pattern and checks for a match + against the pathname relative to the location of the + `.gitignore` file (relative to the toplevel of the work tree + if not from a `.gitignore` file). - Otherwise, git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: diff --git a/attr.c b/attr.c index 3fde9fa..634b39c 100644 --- a/attr.c +++ b/attr.c @@ -253,7 +253,7 @@ static struct match_attr *parse_attr_line(const char *line, const char *src, res->pat.pattern = p; res->pat.patternlen = strlen(p); res->pat.nowildcardlen = simple_length(p); - if (!strchr(p, '/')) + if (!strchr(p, '/') && !strstr(p, "**")) res->pat.flags |= EXC_FLAG_NODIR; if (*p == '*' && no_wildcard(p+1)) res->pat.flags |= EXC_FLAG_ENDSWITH; diff --git a/dir.c b/dir.c index fd49336..6a5de98 100644 --- a/dir.c +++ b/dir.c @@ -340,7 +340,7 @@ void add_exclude(const char *string, const char *base, x->base = base; x->baselen = baselen; x->flags = flags; - if (!strchr(string, '/')) + if (!strchr(string, '/') && !strstr(string, "**")) x->flags |= EXC_FLAG_NODIR; x->nowildcardlen = simple_length(string); if (*string == '*' && no_wildcard(string+1)) diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index 6c3c554..9b534a0 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -249,4 +249,20 @@ EOF test_line_count = 0 err ' +test_expect_success '"**" with no slashes test' ' + echo "a**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 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 67c8bcf..6a5a4ab 100755 --- a/t/t3001-ls-files-others-exclude.sh +++ b/t/t3001-ls-files-others-exclude.sh @@ -225,4 +225,14 @@ EOF test_cmp expect actual ' + +test_expect_success 'ls-files with "**" patterns and no slashes' ' + cat <<\EOF >expect && +one/a.1 +one/two/a.1 +EOF + git ls-files -o -i --exclude "one**a.1" >actual + test_cmp expect actual +' + test_done
-- 1.7.12.1.405.gb727dc9