Merge branch 'js/regexec-buf' into maint

diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index 4840c71f02a388eeae8223c7f4e67c51ecf745b2..d38bf32470c592f89cbd31aa08a3c1de6fffe540 100755 (executable)
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -74,7 +74,7 @@ test_expect_success 'push to remote repository (standard)' '
        test_tick &&
        git commit -m path2 &&
        HEAD=$(git rev-parse --verify HEAD) &&
-       GIT_CURL_VERBOSE=1 git push -v -v 2>err &&
+       GIT_TRACE_CURL=true git push -v -v 2>err &&
        ! grep "Expect: 100-continue" err &&
        grep "POST git-receive-pack ([0-9]* bytes)" err &&
        (cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&