]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 29b2041 f4ab4f3)
Merge branch 'mh/lockfile-retry'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:55 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:55 +0000 (12:41 -0700)
commitfb257bfa174b00e236ac5d6f4282a487f10a9e98
tree616da2c04e2140fe22bd4cfaf7f3b9b764d769c3tree | snapshot
parent29b2041c2a91d2f80afa9d4e0f6eeb77a3ff5bc6commit | diff
parentf4ab4f3ab117cf375ae7bb8908c7b5ad687342b1commit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
refs.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.