diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:19:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:19:03 -0800 |
| commit | 48d23c12e7329213e0dfd73bbffc6ad05efcaf9d (patch) | |
| tree | 0be1b42a367d5cd1c4bfb0296695be2c7a157fda /Documentation | |
| parent | 8554ee155d8e69703dfaa04d03cd45f2d82f1a0f (diff) | |
| parent | f8edeaa05d8623a9f6dad408237496c51101aad8 (diff) | |
| download | git-48d23c12e7329213e0dfd73bbffc6ad05efcaf9d.tar.gz | |
Merge branch 'dt/smart-http-detect-server-going-away' into maint
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 d51182a060..febf95d6c6 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2971,6 +2971,11 @@ uploadpack.allowReachableSHA1InWant:: calculating object reachability is computationally expensive. Defaults to `false`. +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 d45f6adc69..f7ebe36a7b 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 -------- |