Skip to content

Commit d426430

Browse files
emilyxxiegitster
authored andcommitted
pathspec: warn 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 "$paht" which would unintentionally remove all paths in the current directory. The fix for this issue requires a two-step approach. As there may be existing scripts that knowingly use empty strings in this manner, the first step simply gives a warning that (1) tells that an empty string will become an invalid pathspec element and (2) asks the user to use "." if they mean to match all. For step two, a follow-up patch several release cycles later will remove the warning and throw an error instead. This patch is the first step. Signed-off-by: Emily Xie <[email protected]> Reported-by: David Turner <[email protected]> Mentored-by: Michail Denchev <[email protected]> Thanks-to: Sarah Sharp <[email protected]> and James Sharp <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 05219a1 commit d426430

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

pathspec.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ void parse_pathspec(struct pathspec *pathspec,
364364
{
365365
struct pathspec_item *item;
366366
const char *entry = argv ? *argv : NULL;
367-
int i, n, prefixlen, nr_exclude = 0;
367+
int i, n, prefixlen, warn_empty_string, nr_exclude = 0;
368368

369369
memset(pathspec, 0, sizeof(*pathspec));
370370

@@ -402,8 +402,15 @@ void parse_pathspec(struct pathspec *pathspec,
402402
}
403403

404404
n = 0;
405-
while (argv[n])
405+
warn_empty_string = 1;
406+
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+
}
406412
n++;
413+
}
407414

408415
pathspec->nr = n;
409416
ALLOC_ARRAY(pathspec->items, n);

t/t3600-rm.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,4 +881,9 @@ test_expect_success 'rm files with two different errors' '
881881
test_i18ncmp expect actual
882882
'
883883

884+
test_expect_success 'rm empty string should invoke warning' '
885+
git rm -rf "" 2>output &&
886+
test_i18ngrep "warning: empty strings" output
887+
'
888+
884889
test_done

t/t3700-add.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,4 +332,9 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file out
332332
test_i18ncmp expect.err actual.err
333333
'
334334

335+
test_expect_success 'git add empty string should invoke warning' '
336+
git add "" 2>output &&
337+
test_i18ngrep "warning: empty strings" output
338+
'
339+
335340
test_done

0 commit comments

Comments
 (0)