Merge branch 'rh/merge-options-doc-fix' into maint

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 8a9dc859317dc085dc99ddbd28eeada26c4d7d7e..beb00be4b1593a058308d8897fed81a7cf1556d7 100755 (executable)
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -181,8 +181,7 @@ test_expect_success 'push (chunked)' '
        git checkout master &&
        test_commit commit path3 &&
        HEAD=$(git rev-parse --verify HEAD) &&
-       git config http.postbuffer 4 &&
-       test_when_finished "git config --unset http.postbuffer" &&
+       test_config http.postbuffer 4 &&
        git push -v -v origin $BRANCH 2>err &&
        grep "POST git-receive-pack (chunked)" err &&
        (cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&