diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-10 15:24:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-10 15:24:25 -0800 |
| commit | d984592043aec3c9f5b1955560a133896ca115b5 (patch) | |
| tree | 7bae1e3caccc682524e72de81e760fc3b031dbef /Documentation | |
| parent | 979b82f19f3c44d34779c46c636aade514a711a9 (diff) | |
| parent | f8edeaa05d8623a9f6dad408237496c51101aad8 (diff) | |
| download | git-d984592043aec3c9f5b1955560a133896ca115b5.tar.gz git-d984592043aec3c9f5b1955560a133896ca115b5.tar.xz | |
Merge branch 'dt/smart-http-detect-server-going-away'
When the http server gives an incomplete response to a smart-http
rpc call, it could lead to client waiting for a full response that
will never come. Teach the client side to notice this condition
and abort the transfer.
An improvement counterproposal has failed.
cf. <20161114194049.mktpsvgdhex2f4zv@sigill.intra.peff.net>
* dt/smart-http-detect-server-going-away:
upload-pack: optionally allow fetching any sha1
remote-curl: don't hang when a server dies before any output
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-fetch-pack.txt | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 4a991f358..1abf078c4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -3030,6 +3030,11 @@ uploadpack.allowReachableSHA1InWant:: section of the linkgit:gitnamespaces[7] man page; it's best to keep private data in a separate repository. +uploadpack.allowAnySHA1InWant:: + Allow `upload-pack` to accept a fetch request that asks for any + object at all. + Defaults to `false`. + uploadpack.keepAlive:: When `upload-pack` has started `pack-objects`, there may be a quiet period while `pack-objects` prepares the pack. Normally diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt index d45f6adc6..f7ebe36a7 100644 --- a/Documentation/git-fetch-pack.txt +++ b/Documentation/git-fetch-pack.txt @@ -119,9 +119,9 @@ be in a separate packet, and the list must end with a flush packet. $GIT_DIR (e.g. "HEAD", "refs/heads/master"). When unspecified, update from all heads the remote side has. + -If the remote has enabled the options `uploadpack.allowTipSHA1InWant` or -`uploadpack.allowReachableSHA1InWant`, they may alternatively be 40-hex -sha1s present on the remote. +If the remote has enabled the options `uploadpack.allowTipSHA1InWant`, +`uploadpack.allowReachableSHA1InWant`, or `uploadpack.allowAnySHA1InWant`, +they may alternatively be 40-hex sha1s present on the remote. SEE ALSO -------- |