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

Really fix bug that caused the assistant to make many unncessary empty merge commits.

Browse source
This commit is contained in:
Joey Hess 2014-07-09 15:18:00 -04:00
parent d76b5a674f
commit 6fe35aab87
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Assistant/Threads/Merger.hs
View file

@ -78,8 +78,7 @@ onChange file
changedbranch = fileToBranch file
mergecurrent (Just current)
| equivBranches changedbranch current = do
void $ liftAnnex $ autoMergeFrom changedbranch (Just current) Git.Branch.AutomaticCommit
| equivBranches changedbranch current =
whenM (liftAnnex $ inRepo $ Git.Branch.changed current changedbranch) $ do
debug
[ "merging", Git.fromRef changedbranch

2
debian/changelog vendored
View file

@ -7,6 +7,8 @@ git-annex (5.20140708) UNRELEASED; urgency=medium
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/
* Really fix bug that caused the assistant to make many unncessary
empty merge commits.
-- Joey Hess <joeyh@debian.org> Tue, 08 Jul 2014 12:44:42 -0400

3
doc/bugs/Assistant_merge_loop.mdwn
View file

@ -14,3 +14,6 @@ Using the standalone build, 64bit, on ArchLinux, Fedora 20 and Ubuntu 14.04.
local repository version: 5
supported repository version: 5
upgrade supported from repository versions: 0 1 2 4
> [[fixed|done]]. Note that 5.20140708 contained an incomplete fix for this
> bug. --[[Joey]]