From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Dec 2016 22:45:35 +0000 (-0800)
Subject: Merge branch 'jc/lock-report-on-error'
X-Git-Tag: v2.12.0-rc0~128
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95713ff4fb858c4f2e7c339cfc503c0cf152e071;p=thirdparty%2Fgit.git

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
---

95713ff4fb858c4f2e7c339cfc503c0cf152e071