[PATCH 2/2] pathspec: don't error out on all-exclusionary pathspec patterns
- From
Linus Torvalds <torvalds@linux-foundation.org>
- Date
- Feb 8, 2017, 05:14 UTC
- Message-ID
- <alpine.LFD.2.20.1702072113380.25002@i7.lan>
From: Linus Torvalds <torvalds@linux-foundation.org> Date: Tue, 7 Feb 2017 21:08:15 -0800 Subject: [PATCH 2/2] pathspec: don't error out on all-exclusionary pathspec patterns
Instead of erroring out and telling the user that they should add a positive pattern that covers everything else, just _do_ that.
For commands where we honor the current cwd by default (ie grep, ls-files etc), we make that default positive pathspec be the current working directory. And for commands that default to the whole project (ie diff, log, etc), the default positive pathspec is the whole project.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> --- pathspec.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/pathspec.c b/pathspec.c index ecad03406..d8f78088c 100644 --- a/pathspec.c +++ b/pathspec.c @@ -522,7 +522,7 @@ void parse_pathspec(struct pathspec *pathspec, } pathspec->nr = n; - ALLOC_ARRAY(pathspec->items, n); + ALLOC_ARRAY(pathspec->items, n+1); item = pathspec->items; prefixlen = prefix ? strlen(prefix) : 0; @@ -546,10 +546,16 @@ void parse_pathspec(struct pathspec *pathspec, pathspec->magic |= item[i].magic; } - if (nr_exclude == n) - die(_("There is nothing to exclude from by :(exclude) patterns.\n" - "Perhaps you forgot to add either ':/' or '.' ?")); - + /* + * If everything is an exclude pattern, add one positive pattern + * that matches everyting. We allocated an extra one for this. + */ + if (nr_exclude == n) { + if (!(flags & PATHSPEC_PREFER_CWD)) + prefixlen = 0; + init_pathspec_item(item + n, 0, prefix, prefixlen, ""); + pathspec->nr++; + } if (pathspec->magic & PATHSPEC_MAXDEPTH) { if (flags & PATHSPEC_KEEP_ORDER)
-- 2.12.0.rc0.1.g02555c1b2.dirty