diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-11-18 19:44:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-18 19:44:36 -0800 |
| commit | 8b56a4702209a6054bd1eb89e9d63abfd6f4cf2e (patch) | |
| tree | f431ee2c5b4a01d619419909b0cfeeaf222a447d /git-rebase--merge.sh | |
| parent | Merge branch 'po/maint-refs-replace-docs' into maint (diff) | |
| parent | Fix potential hang in https handshake (diff) | |
| download | tgif-8b56a4702209a6054bd1eb89e9d63abfd6f4cf2e.tar.xz | |
Merge branch 'sz/maint-curl-multi-timeout' into maint
Sometimes curl_multi_timeout() function suggested a wrong timeout
value when there is no file descriptors to wait on and the http
transport ended up sleeping for minutes in select(2) system call. A
workaround has been added for this.
* sz/maint-curl-multi-timeout:
Fix potential hang in https handshake
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions