Merge branch 'mh/lockfile-retry' into next
commit7ad2e9d9cea80893f00d6b65cfe6e4ed5f0ba0b3
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 May 2015 22:07:12 +0000 (20 15:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 May 2015 22:07:12 +0000 (20 15:07 -0700)
tree8822ce51de388ae359ec23950b7240084d27f4b1
parent3179493ddf99afea85d647dbfa9ebe48a70b9cc0
parentf4ab4f3ab117cf375ae7bb8908c7b5ad687342b1
Merge branch 'mh/lockfile-retry' into next

Instead of dying immediately upon failing to obtain a lock, retry
after a short while with backoff.

* mh/lockfile-retry:
  lock_packed_refs(): allow retries when acquiring the packed-refs lock
  lockfile: allow file locking to be retried with a timeout
Documentation/config.txt
refs.c