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

Merge branch 'jc/lock-report-on-error'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2016-12-19 14:45:35 -08:00
parent 731490bf06 3f061bf514
commit 95713ff4fb
22 changed files with 49 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.c
View File

@ -2133,7 +2133,7 @@ int merge_recursive_generic(struct merge_options *o,
}
}
hold_locked_index(lock, 1);
hold_locked_index(lock, LOCK_DIE_ON_ERROR);
clean = merge_recursive(o, head_commit, next_commit, ca,
result);
if (clean < 0)