summaryrefslogtreecommitdiff
path: root/pathspec.c
diff options
context:
space:
mode:
authorEmily Xie <emilyxxie@gmail.com>2017-06-06 23:33:08 -0400
committerJunio C Hamano <gitster@pobox.com>2017-06-23 13:10:35 -0700
commit9e4e8a64c2b9043b7ae2b6476efd9214c6738505 (patch)
tree317d8dd274c22021d217e9319441660098884286 /pathspec.c
parent229a95aafa77b583b46a3156b4fad469c264ddfd (diff)
downloadgit-9e4e8a64c2b9043b7ae2b6476efd9214c6738505.tar.gz
pathspec: die on empty strings as pathspecex/deprecate-empty-pathspec-as-match-all
An empty string as a pathspec element matches all paths. A buggy script, however, could accidentally assign an empty string to a variable that then gets passed to a Git command invocation, e.g.: path=... compute a path to be removed in $path ... git rm -r "$path" which would unintentionally remove all paths in the current directory. The fix for this issue comprises of two steps. Step 1, which warns that empty strings as pathspecs will become invalid, has already been implemented in commit d426430 ("pathspec: warn on empty strings as pathspec", 2016-06-22). This patch is step 2. It removes the warning and throws an error instead. Signed-off-by: Emily Xie <emilyxxie@gmail.com> Reported-by: David Turner <novalis@novalis.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 729df9f385..c32503d079 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -364,7 +364,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));
@@ -402,13 +402,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++;
}