Skip to content

Commit

Permalink
Clarify that http-push being temporarily disabled with older cURL
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
gitster committed Jan 22, 2008
1 parent 6fc7470 commit 4f5f998
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
14 changes: 12 additions & 2 deletions Documentation/RelNotes-1.5.4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Documentation/git-http-push.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------
Expand Down
8 changes: 8 additions & 0 deletions http.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4f5f998

Please sign in to comment.