summaryrefslogtreecommitdiff
path: root/pathspec.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-06 04:11:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-06 04:11:29 (GMT)
commit728c57380338eed1aaad6047046ca71826e8066c (patch)
treed4b2f8372dbb16a7bbca29e73cb682f495cc140b /pathspec.c
parente4db47e6a038adcde36ef6305a15d3d7ee49487c (diff)
parent9e4e8a64c2b9043b7ae2b6476efd9214c6738505 (diff)
downloadgit-728c57380338eed1aaad6047046ca71826e8066c.zip
git-728c57380338eed1aaad6047046ca71826e8066c.tar.gz
git-728c57380338eed1aaad6047046ca71826e8066c.tar.bz2
Merge branch 'ex/deprecate-empty-pathspec-as-match-all'
The final step to make an empty string as a pathspec element illegal. We started this by first deprecating and warning a pathspec that has such an element in 2.11 (Nov 2016). Hopefully we can merge this down to the 'master' by the end of the year? A deprecation warning period that is about 1 year does not sound too bad. * ex/deprecate-empty-pathspec-as-match-all: pathspec: die on empty strings as pathspec t0027: do not use an empty string as a pathspec element
Diffstat (limited to 'pathspec.c')
-rw-r--r--pathspec.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/pathspec.c b/pathspec.c
index cdefdc7..82eb39c 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -532,7 +532,7 @@ void parse_pathspec(struct pathspec *pathspec,
{
struct pathspec_item *item;
const char *entry = argv ? *argv : NULL;
- int i, n, prefixlen, warn_empty_string, nr_exclude = 0;
+ int i, n, prefixlen, nr_exclude = 0;
memset(pathspec, 0, sizeof(*pathspec));
@@ -565,13 +565,10 @@ void parse_pathspec(struct pathspec *pathspec,
}
n = 0;
- warn_empty_string = 1;
while (argv[n]) {
- if (*argv[n] == '\0' && warn_empty_string) {
- warning(_("empty strings as pathspecs will be made invalid in upcoming releases. "
- "please use . instead if you meant to match all paths"));
- warn_empty_string = 0;
- }
+ if (*argv[n] == '\0')
+ die("empty string is not a valid pathspec. "
+ "please use . instead if you meant to match all paths");
n++;
}