projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ba78f39 da5267f)
Merge branch 'mh/ref-locking-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Oct 2017 03:29:23 +0000 (12:29 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Oct 2017 03:29:23 +0000 (12:29 +0900)
commit4e40fb302eacf4949f6b7d010fd5c11f1f652b7f
treec63abb71b4cf714fb42bc56e93b9f0a3665baf2btree | snapshot
parentba78f398be65e941b93276680f68a81075716472commit | diff
parentda5267f1b66dfe83a92698e49fa10dee5f74224fcommit | diff
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
refs/files-backend.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.