projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1ede815 b22d748)
Merge branch 'jc/lock-report-on-error' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 21:41:06 +0000 (13:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 21:41:06 +0000 (13:41 -0800)
commitab2ae230f473762e763f072d9d69015de9dbfb99
treee91bd257026ef73df27a8f38a1565e99cc525815tree | snapshot
parent1ede815b8d1562f46b7aa5d55af084a3cad2ecf8commit | diff
parentb22d7484034670d08f438c9f1376423adce1e29ccommit | diff
Merge branch 'jc/lock-report-on-error' into next

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: move REPORT_ON_ERROR bit elsewhere
Unnamed repository; edit this file 'description' to name the repository.