aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-17 15:19:03 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-17 15:19:03 -0800
commit48d23c12e7329213e0dfd73bbffc6ad05efcaf9d (patch)
tree0be1b42a367d5cd1c4bfb0296695be2c7a157fda /merge-recursive.c
parent8554ee155d8e69703dfaa04d03cd45f2d82f1a0f (diff)
parentf8edeaa05d8623a9f6dad408237496c51101aad8 (diff)
downloadgit-48d23c12e7329213e0dfd73bbffc6ad05efcaf9d.tar.gz
git-48d23c12e7329213e0dfd73bbffc6ad05efcaf9d.tar.xz
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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions