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

assistant: Fix bug, introduced in last release, that caused the assistant to make many unncessary empty merge commits.

Browse source
This commit is contained in:
Joey Hess 2014-07-05 17:12:05 -04:00
parent 91688ae46e
commit 4a66cd3f91
4 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Assistant/Threads/Merger.hs
View file

@ -79,11 +79,13 @@ onChange file
mergecurrent (Just current)
| equivBranches changedbranch current = do
debug
[ "merging", Git.fromRef changedbranch
, "into", Git.fromRef current
]
void $ liftAnnex $ autoMergeFrom changedbranch (Just current) Git.Branch.AutomaticCommit
void $ liftAnnex $ autoMergeFrom changedbranch (Just current) Git.Branch.AutomaticCommit
whenM (liftAnnex $ inRepo $ Git.Branch.changed current changedbranch) $ do
debug
[ "merging", Git.fromRef changedbranch
, "into", Git.fromRef current
]
void $ liftAnnex $ autoMergeFrom changedbranch (Just current) Git.Branch.AutomaticCommit
mergecurrent _ = noop
handleDesynced = case fromTaggedBranch changedbranch of