From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Nov 2017 03:14:29 +0000 (+0900)
Subject: Merge branch 'sr/wrapper-quote-filenames'
X-Git-Tag: v2.16.0-rc0~133
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/61f68f607367293d0edb5c297094da1d83cd7fcb?hp=-c

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
---

61f68f607367293d0edb5c297094da1d83cd7fcb
diff --combined t/t3600-rm.sh
index 81c6059a2d,ab5500db44..46f15169f5
--- a/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