From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Oct 2017 03:29:23 +0000 (+0900)
Subject: Merge branch 'mh/ref-locking-fix'
X-Git-Tag: v2.15.0~7
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4e40fb302eacf4949f6b7d010fd5c11f1f652b7f;p=git-core%2Fgit.git

Merge branch 'mh/ref-locking-fix'

Transactions to update multiple references that involves a deletion
was quite broken in an error codepath and did not abort everything
correctly.

* mh/ref-locking-fix:
  files_transaction_prepare(): fix handling of ref lock failure
  t1404: add a bunch of tests of D/F conflicts
---

4e40fb302eacf4949f6b7d010fd5c11f1f652b7f