Re: [PATCH] http-push: making HTTP push more robust and more user-friendly
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 22, 2008, 01:34 UTC
- Message-ID
- <7vy7aive18.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <alpine.LSU.1.00.0801220056080.5731@racer.site>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> So I am half-convinced that http-push w/o CURL_MULTI was broken since long > ago (pre 1.5.3).
Sigh, but Ok. Then let's do this.
-- >8 -- Clarify that http-push being temporarily disabled with older cURL
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Documentation/RelNotes-1.5.4.txt | 14 ++++++++++++-- Documentation/git-http-push.txt | 3 +++ http.h | 8 ++++++++ 3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index 9c864c9..b3cc5e0 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -10,8 +10,18 @@ Removal * As git-commit and git-status have been rewritten, "git runstatus" helper script lost all its users and has been removed. - * Curl library older than 7.10 is not supported by "git http-push", - as it does not work without CURLM. + +Temporarily Disabled +-------------------- + + * "git http-push" is known not to work well with cURL library older + than 7.16, and we had reports of repository corruption. It is + disabled on such platforms for now. Unfortunately, 1.5.3.8 shares + the same issue. In other words, this does not mean you will be + fine if you stick to an older git release. For now, please do not + use http-push from older git with cURL older than 7.16 if you + value your data. A proper fix will hopefully materialize in + later versions. Deprecation notices diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt index cca77f1..0b82722 100644 --- a/Documentation/git-http-push.txt +++ b/Documentation/git-http-push.txt @@ -15,6 +15,9 @@ DESCRIPTION Sends missing objects to remote repository, and updates the remote branch. +*NOTE*: This command is temporarily disabled if your cURL +library is older than 7.16, as the combination has been reported +not to work and sometimes corrupts repository. OPTIONS ------- diff --git a/http.h b/http.h index aeba930..9bab2c8 100644 --- a/http.h +++ b/http.h @@ -8,6 +8,14 @@ #include "strbuf.h" +/* + * We detect based on the cURL version if multi-transfer is + * usable in this implementation and define this symbol accordingly. + * This is not something Makefile should set nor users should pass + * via CFLAGS. + */ +#undef USE_CURL_MULTI + #if LIBCURL_VERSION_NUM >= 0x071000 #define USE_CURL_MULTI #define DEFAULT_MAX_REQUESTS 5
-- 1.5.4.rc4.11.g7422b