Merge branch 'jk/connect-symref-info-leak-fix' into maint

diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 347857fa7c7cb12a4bc9fd6a2f5373347a02db5c..034914a14fd49fea07e8bff4802994fcd38807a9 100755 (executable)
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -442,12 +442,12 @@ test_expect_success 'submodule update - command in .git/config catches failure -
 '
 
 test_expect_success 'submodule update - command run for initial population of submodule' '
-       cat <<-\ EOF >expect
+       cat >expect <<-EOF &&
        Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\''
-       EOF &&
+       EOF
        rm -rf super/submodule &&
-       test_must_fail git -C super submodule update >../actual &&
-       test_cmp expect actual &&
+       test_must_fail git -C super submodule update 2>actual &&
+       test_i18ncmp expect actual &&
        git -C super submodule update --checkout
 '