The sixth batch for 2.18

diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 79bc135bf69ea5813f0a372db6bbefa0f9a92753..0726799e74e7a587e920c35f356b3364737b70d2 100755 (executable)
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -62,13 +62,13 @@ test_expect_success 'change submodule' '
 '
 
 reset_submodule_urls () {
-       local root
-       root=$(pwd) &&
        (
+               root=$(pwd) &&
                cd super-clone/submodule &&
                git config remote.origin.url "$root/submodule"
        ) &&
        (
+               root=$(pwd) &&
                cd super-clone/submodule/sub-submodule &&
                git config remote.origin.url "$root/submodule"
        )
@@ -157,7 +157,7 @@ test_expect_success '"git submodule sync" should update submodule URLs - subdire
                cd sub &&
                git submodule sync >../../output
        ) &&
-       grep "\\.\\./submodule" output &&
+       test_i18ngrep "\\.\\./submodule" output &&
        test -d "$(
                cd super-clone/submodule &&
                git config remote.origin.url
@@ -188,7 +188,7 @@ test_expect_success '"git submodule sync --recursive" should update all submodul
                cd sub &&
                git submodule sync --recursive >../../output
        ) &&
-       grep "\\.\\./submodule/sub-submodule" output &&
+       test_i18ngrep "\\.\\./submodule/sub-submodule" output &&
        test -d "$(
                cd super-clone/submodule &&
                git config remote.origin.url