Merge branch 'js/sleep-without-select'
commit510ab3f3c19566b43be02ec13c3326fa04a4a677
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:47 +0000 (24 12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:47 +0000 (24 12:21 -0700)
tree22deebaa0dc0fc0229dd82d3fa4307d35ee84ac0
parent5d24b109a64827708cbe98b865aba5d51a2f7c3b
parent30f8160d26f11156a6792565fe694c813406b929
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()
cache.h
help.c
lockfile.c