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
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