diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-26 12:29:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-26 12:29:23 +0900 |
| commit | 4e40fb302eacf4949f6b7d010fd5c11f1f652b7f (patch) | |
| tree | c63abb71b4cf714fb42bc56e93b9f0a3665baf2b /pretty.c | |
| parent | ba78f398be65e941b93276680f68a81075716472 (diff) | |
| parent | da5267f1b66dfe83a92698e49fa10dee5f74224f (diff) | |
| download | git-4e40fb302eacf4949f6b7d010fd5c11f1f652b7f.tar.gz git-4e40fb302eacf4949f6b7d010fd5c11f1f652b7f.tar.xz | |
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
Diffstat (limited to 'pretty.c')
0 files changed, 0 insertions, 0 deletions