diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 06:14:29 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 06:14:29 +0300 |
| commit | 61f68f607367293d0edb5c297094da1d83cd7fcb (patch) | |
| tree | 86df363af18e135fd89d7461255e7b9758d40e23 /t/t3600-rm.sh | |
| parent | f116163171b875f9b58c6f6755bec85460e9b8b8 (diff) | |
| parent | 0a288d1ee9a259d9faf238c5e4f5aedf5090d599 (diff) | |
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-x | t/t3600-rm.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 81c6059a2d..46f15169f5 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 && |