Junio C Hamano 4e40fb302e 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

2017-10-26 12:29:23 +09:00

..

files-backend.c

Merge branch 'mh/ref-locking-fix'

2017-10-26 12:29:23 +09:00

iterator.c

prefix_ref_iterator: break when we leave the prefix

2017-09-14 15:19:07 +09:00

packed-backend.c

Merge branch 'rs/cleanup-strbuf-users'

2017-10-05 13:48:19 +09:00

packed-backend.h

packed-backend: rip out some now-unused code

2017-09-09 03:18:04 +09:00

ref-cache.c

ref_cache: remove support for storing peeled values

2017-09-25 18:02:46 +09:00

ref-cache.h

ref_cache: remove support for storing peeled values

2017-09-25 18:02:46 +09:00

refs-internal.h

Merge branch 'mh/mmap-packed-refs'

2017-10-03 15:42:50 +09:00