mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Junio C Hamano
2017-12-06 09:09:03 -08:00
parent 43240cb731 bd58886775
commit 0175b6e2b9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sequencer.c
View File

@ -438,7 +438,8 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
char **xopt; char **xopt;
static struct lock_file index_lock; static struct lock_file index_lock;
hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR); if (hold_locked_index(&index_lock, LOCK_REPORT_ON_ERROR) < 0)
return -1;
read_cache(); read_cache();