@matheusbsbs / matheus-bagliano / commits / 9e4e8a64c2

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>

Emily Xie committed Jun 6, 2017 at 23:33 UTC 9e4e8a64c2b9043b7ae2b6476efd9214c6738505

3 files changed +8 -13

pathspec.c

+4 -7

@@ -364,7 +364,7 @@ void parse_pathspec(struct pathspec *pathspec,

364 {

365 struct pathspec_item *item;

366 const char *entry = argv ? *argv : NULL;

367 - int i, n, prefixlen, warn_empty_string, nr_exclude = 0;

367 + int i, n, prefixlen, nr_exclude = 0;

368

369 memset(pathspec, 0, sizeof(*pathspec));

370

@@ -402,13 +402,10 @@ void parse_pathspec(struct pathspec *pathspec,

402 }

403

404 n = 0;

405 - warn_empty_string = 1;

405 while (argv[n]) {

407 - if (*argv[n] == '\0' && warn_empty_string) {

408 - warning(_("empty strings as pathspecs will be made invalid in upcoming releases. "

409 - "please use . instead if you meant to match all paths"));

410 - warn_empty_string = 0;

411 - }

406 + if (*argv[n] == '\0')

407 + die("empty string is not a valid pathspec. "

408 + "please use . instead if you meant to match all paths");

409 n++;

410 }

411

t/t3600-rm.sh

+2 -3

@@ -881,9 +881,8 @@ test_expect_success 'rm files with two different errors' '

881 test_i18ncmp expect actual

882 '

883

884 -test_expect_success 'rm empty string should invoke warning' '

885 - git rm -rf "" 2>output &&

886 - test_i18ngrep "warning: empty strings" output

884 +test_expect_success 'rm empty string should fail' '

885 + test_must_fail git rm -rf ""

886 '

887

888 test_done

t/t3700-add.sh

+2 -3

@@ -332,9 +332,8 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file out

332 test_i18ncmp expect.err actual.err

333 '

334

335 -test_expect_success 'git add empty string should invoke warning' '

336 - git add "" 2>output &&

337 - test_i18ngrep "warning: empty strings" output

335 +test_expect_success 'git add empty string should fail' '

336 + test_must_fail git add ""

337 '

338

339 test_done