diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-09 15:18:00 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-09 15:18:00 -0400 |
| commit | 06acd390fbc2340c5878cbf3831e058f71080988 (patch) | |
| tree | 968f07a1746b72df9656a4fd390d28415b502f1a | |
| parent | 7a62581096d328a0403944286125c1bab8be0edc (diff) | |
Really fix bug that caused the assistant to make many unncessary empty merge commits.
| -rw-r--r-- | Assistant/Threads/Merger.hs | 3 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/Assistant_merge_loop.mdwn | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 63c9968a7..62dab59af 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -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 diff --git a/debian/changelog b/debian/changelog index 294e404df..817c31612 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/doc/bugs/Assistant_merge_loop.mdwn b/doc/bugs/Assistant_merge_loop.mdwn index d0d710866..edff5e4b3 100644 --- a/doc/bugs/Assistant_merge_loop.mdwn +++ b/doc/bugs/Assistant_merge_loop.mdwn @@ -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]] |