diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-23 11:16:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-23 11:16:50 -0700 |
| commit | f87f7424df3e3fba0b0211c9a7fe78fe1e526802 (patch) | |
| tree | 066878e0d905e1f92261231cd5ead72234878620 /mergetools/tortoisemerge | |
| parent | Sync with maint (diff) | |
| parent | receive-pack: close sideband fd on early pack errors (diff) | |
| download | tgif-f87f7424df3e3fba0b0211c9a7fe78fe1e526802.tar.xz | |
Merge branch 'jk/receive-pack-deadlocks-with-early-failure'
When receive-pack detects error in the pack header it received in
order to decide which of unpack-objects or index-pack to run, it
returned without closing the error stream, which led to a hang
sideband thread.
* jk/receive-pack-deadlocks-with-early-failure:
receive-pack: close sideband fd on early pack errors
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions