Merge branch 'sb/submodule-recommend-shallowness'

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 8049cad374827d15ec098218b01acb59b65383ee..805dc9012d5f765eb40a67e58c1572b1fe316bd6 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -1072,7 +1072,7 @@ test_expect_success '--from omits redundant in-body header' '
 '
 
 test_expect_success 'in-body headers trigger content encoding' '
-       GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&
+       test_env GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&
        test_when_finished "git reset --hard HEAD^" &&
        git format-patch -1 --stdout --from >patch &&
        cat >expect <<-\EOF &&