summaryrefslogtreecommitdiff
path: root/t/t3600-rm.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-15 03:14:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-15 03:14:29 (GMT)
commit61f68f607367293d0edb5c297094da1d83cd7fcb (patch)
tree86df363af18e135fd89d7461255e7b9758d40e23 /t/t3600-rm.sh
parentf116163171b875f9b58c6f6755bec85460e9b8b8 (diff)
parent0a288d1ee9a259d9faf238c5e4f5aedf5090d599 (diff)
downloadgit-61f68f607367293d0edb5c297094da1d83cd7fcb.zip
git-61f68f607367293d0edb5c297094da1d83cd7fcb.tar.gz
git-61f68f607367293d0edb5c297094da1d83cd7fcb.tar.bz2
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
Diffstat (limited to 't/t3600-rm.sh')
-rwxr-xr-xt/t3600-rm.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 81c6059..46f1516 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 &&