Merge branch 'sr/wrapper-quote-filenames'

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

diff --combined t/t3600-rm.sh
index 81c6059a2d9fe4d23e3fac11d765ecaf20aef756,ab5500db445bad56774bf8eae731c9e2e19718a9..46f15169f55c03742717f36f8d0e99241391b2ea
--- 1/t/t3600-rm.sh
--- 2/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@@ -688,7 -688,7 +688,7 @@@ test_expect_success 'checking out a com
        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 &&
@@@ -858,8 -858,9 +858,8 @@@ test_expect_success 'rm files with two 
        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