undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pathspec: die on empty strings as pathspec

Browse Source 
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>
This commit is contained in:
Emily Xie 2017-06-06 23:33:08 -04:00 committed by Junio C Hamano
parent 229a95aafa
commit 9e4e8a64c2
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pathspec.c
View File

@ -364,7 +364,7 @@ void parse_pathspec(struct pathspec *pathspec,
{ {
struct pathspec_item *item; struct pathspec_item *item;
const char *entry = argv ? *argv : NULL; 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)); memset(pathspec, 0, sizeof(*pathspec));
@ -402,13 +402,10 @@ void parse_pathspec(struct pathspec *pathspec,
} }
n = 0; n = 0;
warn_empty_string = 1;
while (argv[n]) { while (argv[n]) {
if (*argv[n] == '\0' && warn_empty_string) { if (*argv[n] == '\0')
warning(_("empty strings as pathspecs will be made invalid in upcoming releases. " die("empty string is not a valid pathspec. "
"please use . instead if you meant to match all paths")); "please use . instead if you meant to match all paths");
warn_empty_string = 0;
}
n++; n++;
} }

5
t/t3600-rm.sh
View File

@ -881,9 +881,8 @@ test_expect_success 'rm files with two different errors' '
test_i18ncmp expect actual test_i18ncmp expect actual
' '
test_expect_success 'rm empty string should invoke warning' ' test_expect_success 'rm empty string should fail' '
git rm -rf "" 2>output && test_must_fail git rm -rf ""
test_i18ngrep "warning: empty strings" output
' '
test_done test_done

5
t/t3700-add.sh
View File

@ -332,9 +332,8 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file out
test_i18ncmp expect.err actual.err test_i18ncmp expect.err actual.err
' '
test_expect_success 'git add empty string should invoke warning' ' test_expect_success 'git add empty string should fail' '
git add "" 2>output && test_must_fail git add ""
test_i18ngrep "warning: empty strings" output
' '
test_done test_done