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 /.gitignore | |
| parent | Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-po (diff) | |
| parent | files_transaction_prepare(): fix handling of ref lock failure (diff) | |
| download | tgif-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 '.gitignore')
0 files changed, 0 insertions, 0 deletions