Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
pathspec: die on empty strings as pathspec
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>
  • Loading branch information
emilyxxie authored and gitster committed Jun 23, 2017
1 parent 229a95a commit 9e4e8a6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 13 deletions.
11 changes: 4 additions & 7 deletions pathspec.c
Expand Up @@ -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));

Expand Down Expand Up @@ -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++;
}

Expand Down
5 changes: 2 additions & 3 deletions t/t3600-rm.sh
Expand Up @@ -881,9 +881,8 @@ test_expect_success 'rm files with two different errors' '
test_i18ncmp expect actual
'

test_expect_success 'rm empty string should invoke warning' '
git rm -rf "" 2>output &&
test_i18ngrep "warning: empty strings" output
test_expect_success 'rm empty string should fail' '
test_must_fail git rm -rf ""
'

test_done
5 changes: 2 additions & 3 deletions t/t3700-add.sh
Expand Up @@ -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_expect_success 'git add empty string should invoke warning' '
git add "" 2>output &&
test_i18ngrep "warning: empty strings" output
test_expect_success 'git add empty string should fail' '
test_must_fail git add ""
'

test_done

0 comments on commit 9e4e8a6

Please sign in to comment.