From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Nov 2017 02:06:35 +0000 (+0900)
Subject: Merge branch 'pw/sequencer-recover-from-unlockable-index'
X-Git-Tag: v2.16.0-rc0~99
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2ed68342b8247d99fa1204872984ce9817fbaae;p=thirdparty%2Fgit.git

Merge branch 'pw/sequencer-recover-from-unlockable-index'

The sequencer machinery (used by "git cherry-pick A..B", and "git
rebase -i", among other things) would have lost a commit if stopped
due to an unlockable index file, which has been fixed.

* pw/sequencer-recover-from-unlockable-index:
  sequencer: reschedule pick if index can't be locked
---

c2ed68342b8247d99fa1204872984ce9817fbaae