diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-20 01:45:35 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-20 01:45:35 +0300 |
| commit | 95713ff4fb858c4f2e7c339cfc503c0cf152e071 (patch) | |
| tree | 988d8503fff22d5ddcc2d21afb88e05e5f295350 /sequencer.c | |
| parent | 731490bf06792a4c96b61965cba2a0e430118e78 (diff) | |
| parent | 3f061bf514667497a948804828064b9b9c3b249b (diff) | |
Merge branch 'jc/lock-report-on-error'
Git 2.11 had a minor regression in "merge --ff-only" that competed
with another process that simultanously attempted to update the
index. We used to explain what went wrong with an error message,
but the new code silently failed. The error message has been
resurrected.
* jc/lock-report-on-error:
lockfile: LOCK_REPORT_ON_ERROR
hold_locked_index(): align error handling with hold_lockfile_for_update()
wt-status: implement opportunisitc index update correctly
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 050e28bbc3..28061dcb78 100644 --- a/sequencer.c +++ b/sequencer.c @@ -323,7 +323,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next, char **xopt; static struct lock_file index_lock; - hold_locked_index(&index_lock, 1); + hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR); read_cache(); |