diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-01-21 17:34:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-22 00:48:29 -0800 |
| commit | 4f5f998fbd64c997ea875d69fd86b6362e04ce9b (patch) | |
| tree | 414b97e7e377b51dca017b19eaecfe0ac5f2dd9d | |
| parent | 6fc74703dee571859d8be270f5496f4c9b2ff9c7 (diff) | |
| download | git-4f5f998fbd64c997ea875d69fd86b6362e04ce9b.tar.gz git-4f5f998fbd64c997ea875d69fd86b6362e04ce9b.tar.xz | |
Clarify that http-push being temporarily disabled with older cURL
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes-1.5.4.txt | 14 | ||||
| -rw-r--r-- | Documentation/git-http-push.txt | 3 | ||||
| -rw-r--r-- | 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 9c864c9de..9e43ac23a 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 cca77f10d..0b8272234 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 ------- @@ -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 |