merge: update documentation for {merge,diff}.renameLimit

diff --git a/http.c b/http.c
index 9304045b6cc4a8a6d5c7d38e7255cf8342958bef..3034d10b6804387bc267b27757e2eae2279415d5 100644 (file)
--- a/http.c
+++ b/http.c
@@ -63,6 +63,9 @@ static struct {
        { "tlsv1.1", CURL_SSLVERSION_TLSv1_1 },
        { "tlsv1.2", CURL_SSLVERSION_TLSv1_2 },
 #endif
+#if LIBCURL_VERSION_NUM >= 0x073400
+       { "tlsv1.3", CURL_SSLVERSION_TLSv1_3 },
+#endif
 };
 #if LIBCURL_VERSION_NUM >= 0x070903
 static const char *ssl_key;
@@ -2136,7 +2139,7 @@ int finish_http_pack_request(struct http_pack_request *preq)
                return -1;
        }
 
-       install_packed_git(p);
+       install_packed_git(the_repository, p);
        free(tmp_idx);
        return 0;
 }