From: Junio C Hamano <gitster@pobox.com> Date: Wed, 24 Jun 2015 19:21:47 +0000 (-0700) Subject: Merge branch 'js/sleep-without-select' X-Git-Tag: v2.5.0-rc0~19 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=510ab3f3c19566b43be02ec13c3326fa04a4a677;p=git Merge branch 'js/sleep-without-select' Portability fix. * js/sleep-without-select: lockfile: wait using sleep_millisec() instead of select() lockfile: convert retry timeout computations to millisecond help.c: wrap wait-only poll() invocation in sleep_millisec() lockfile: replace random() by rand() --- 510ab3f3c19566b43be02ec13c3326fa04a4a677