mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/ref-locking-fix'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2017-10-26 12:29:23 +09:00
parent ba78f398be da5267f1b6
commit 4e40fb302e
2 changed files with 142 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
refs/files-backend.c
View File

@ -2570,7 +2570,7 @@ static int files_transaction_prepare(struct ref_store *ref_store,
ret = lock_ref_for_update(refs, update, transaction,
head_ref, &affected_refnames, err);
if (ret)
break;
goto cleanup;
if (update->flags & REF_DELETING &&
!(update->flags & REF_LOG_ONLY) &&