diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-06 07:11:29 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 07:11:29 +0300 |
| commit | 728c57380338eed1aaad6047046ca71826e8066c (patch) | |
| tree | d4b2f8372dbb16a7bbca29e73cb682f495cc140b /t/t3600-rm.sh | |
| parent | e4db47e6a038adcde36ef6305a15d3d7ee49487c (diff) | |
| parent | 9e4e8a64c2b9043b7ae2b6476efd9214c6738505 (diff) | |
Merge branch 'ex/deprecate-empty-pathspec-as-match-all'
The final step to make an empty string as a pathspec element
illegal. We started this by first deprecating and warning a
pathspec that has such an element in 2.11 (Nov 2016).
Hopefully we can merge this down to the 'master' by the end of the
year? A deprecation warning period that is about 1 year does not
sound too bad.
* ex/deprecate-empty-pathspec-as-match-all:
pathspec: die on empty strings as pathspec
t0027: do not use an empty string as a pathspec element
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 f8568f8841..81c6059a2d 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -858,9 +858,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 |