diff options
author | Emily Xie <emilyxxie@gmail.com> | 2017-06-07 05:33:08 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-23 22:10:35 +0200 |
commit | 9e4e8a64c2b9043b7ae2b6476efd9214c6738505 (patch) | |
tree | 317d8dd274c22021d217e9319441660098884286 /t/t3600-rm.sh | |
parent | t0027: do not use an empty string as a pathspec element (diff) | |
download | git-9e4e8a64c2b9043b7ae2b6476efd9214c6738505.tar.xz git-9e4e8a64c2b9043b7ae2b6476efd9214c6738505.zip |
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>
Diffstat (limited to 't/t3600-rm.sh')
-rwxr-xr-x | t/t3600-rm.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 14f0edca2b..44624605e3 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -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 |