Merge branch 'bw/protocol-v1'

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 81c6059a2d9fe4d23e3fac11d765ecaf20aef756..46f15169f55c03742717f36f8d0e99241391b2ea 100755 (executable)
--- 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 &&