summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Jens Axboe <axboe@suse.de>2005-10-20 00:52:32 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-10-20 21:26:31 -0700
commit7872e0556746c70e49c5558d271d35b1fbfb1680 (patch)
tree6602922af56bd2f9f85ba2030651f751e93ad20d /git-merge.sh
parentMerge /pub/scm/git/git to recover lost side branch (diff)
downloadtgif-7872e0556746c70e49c5558d271d35b1fbfb1680.tar.xz
git-daemon poll() spinning out of control
With the '0' timeout given to poll, it returns instantly without any events on my system, causing git-daemon to consume all the CPU time. Use -1 as the timeout so poll() only returns in case of EINTR or actually events being available. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions