mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

prospective fix for bad_merge_commit_deleting_all_files

Browse source 
Assuming my analysis of a race is correct. In any case, this certianly closes a
race..
This commit is contained in:
Joey Hess 2014-07-09 15:07:53 -04:00
parent 4915f9ad03
commit 58acaf8026
4 changed files with 44 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
debian/changelog vendored
View file

@ -3,6 +3,10 @@ git-annex (5.20140708) UNRELEASED; urgency=medium
* Fix git version that supported --no-gpg-sign.
* Fix bug in automatic merge conflict resolution, when one side is an
annexed symlink, and the other side is a non-annexed symlink.
* Fix race in direct mode merge code that could cause all files in the
repository to be removed. It should be able to recover repositories
experiencing this bug without data loss. See:
http://git-annex.branchable.com/bugs/bad_merge_commit_deleting_all_files/
-- Joey Hess <joeyh@debian.org> Tue, 08 Jul 2014 12:44:42 -0400