]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
sequencer: reschedule pick if index can't be locked
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Wed, 15 Nov 2017 10:41:25 +0000 (10:41 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Nov 2017 05:19:12 +0000 (14:19 +0900)
commitbd58886775de24ce3a330775a35c3c2e868967ee
tree0e03764c0e51299afaccbf1cf0946f232d788e4f
parent5a1f5c3060427375de30d609d72ac032516be4c2
sequencer: reschedule pick if index can't be locked

If the index cannot be locked in do_recursive_merge(), issue an
error message and go on to the error recovery codepath, instead of
dying.  When the commit cannot be picked, it needs to be rescheduled
when performing an interactive rebase, but just dying there won't
allow that to happen, and when the user runs 'git rebase --continue'
rather than 'git rebase --abort', the commit gets silently dropped.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
sequencer.c