From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 May 2015 19:41:55 +0000 (-0700)
Subject: Merge branch 'mh/lockfile-retry'
X-Git-Tag: v2.5.0-rc0~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb257bfa174b00e236ac5d6f4282a487f10a9e98;p=thirdparty%2Fgit.git

Merge branch 'mh/lockfile-retry'

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
---

fb257bfa174b00e236ac5d6f4282a487f10a9e98