diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:05:29 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:05:29 +0900 |
| commit | b77b96e29b9429a6cf10dd6fad15f9a220977029 (patch) | |
| tree | e894cf97fcbdcc2adf9373ea744e1d746d5a1cb3 /t | |
| parent | 6baa11dc2a5bb926e88ee9befe88ecf3318ed83c (diff) | |
| parent | 0a288d1ee9a259d9faf238c5e4f5aedf5090d599 (diff) | |
| download | git-b77b96e29b9429a6cf10dd6fad15f9a220977029.tar.gz | |
Merge branch 'sr/wrapper-quote-filenames' into maint
Some error messages did not quote filenames shown in it, which have
been fixed.
* sr/wrapper-quote-filenames:
wrapper.c: consistently quote filenames in error messages
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3600-rm.sh | 2 | ||||
| -rwxr-xr-x | t/t7001-mv.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index f8568f8841..ab5500db44 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -688,7 +688,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual git submodule update && git checkout -q HEAD^ && git checkout -q master 2>actual && - test_i18ngrep "^warning: unable to rmdir submod:" actual && + test_i18ngrep "^warning: unable to rmdir '\''submod'\'':" actual && git status -s submod >actual && echo "?? submod/" >expected && test_cmp expected actual && diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index f5929c46f3..6e5031f56f 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -452,7 +452,7 @@ test_expect_success 'checking out a commit before submodule moved needs manual u git mv sub sub2 && git commit -m "moved sub to sub2" && git checkout -q HEAD^ 2>actual && - test_i18ngrep "^warning: unable to rmdir sub2:" actual && + test_i18ngrep "^warning: unable to rmdir '\''sub2'\'':" actual && git status -s sub2 >actual && echo "?? sub2/" >expected && test_cmp expected actual && |