summaryrefslogtreecommitdiff
path: root/notes-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-19 13:22:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-19 13:22:15 -0700
commit7725bebe21dfa4877dad74b1ac3d921f26f949cf (patch)
tree1057b2ace78b04486bcdd546032f32eaa0c495e0 /notes-merge.h
parentMerge branch 'lf/recv-sideband-cleanup' (diff)
parenthoist out handle_nonblock function for xread and xwrite (diff)
downloadtgif-7725bebe21dfa4877dad74b1ac3d921f26f949cf.tar.xz
Merge branch 'sb/submodule-parallel-fetch'
Fix recently introduced codepaths that are involved in parallel submodule operations, which gave up on reading too early, and could have wasted CPU while attempting to write under a corner case condition. * sb/submodule-parallel-fetch: hoist out handle_nonblock function for xread and xwrite xwrite: poll on non-blocking FDs xread: retry after poll on EAGAIN/EWOULDBLOCK
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions