pretty: --format output should honor logOutputEncoding

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index e6af021c10b61f565e1ebc5b0a974eb949737e07..b58fa1a23243e435f119afb9966b0a80cbc1e4d4 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -145,8 +145,7 @@ test_expect_success 'rebase a single mode change' '
 '
 
 test_expect_success 'rebase is not broken by diff.renames' '
-       git config diff.renames copies &&
-       test_when_finished "git config --unset diff.renames" &&
+       test_config diff.renames copies &&
        git checkout filemove &&
        GIT_TRACE=1 git rebase force-3way
 '