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

fix check that remote branch needs merged

Browse source
This commit is contained in:
Joey Hess 2011-12-31 02:03:39 -04:00
parent 79231bcff0
commit f2b584ad74
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Command/Sync.hs
View file

@ -130,8 +130,8 @@ mergeRemote :: Remote.Remote Annex -> Git.Ref -> CommandCleanup
mergeRemote remote branch = all id <$> mapM go [branch, syncBranch branch] mergeRemote remote branch = all id <$> mapM go [branch, syncBranch branch]
where where
go b = do go b = do
e <- inRepo $ Git.Branch.changed branch b c <- inRepo $ Git.Branch.changed b (remotebranch b)
if e if c
then mergeFrom $ remotebranch b then mergeFrom $ remotebranch b
else return True else return True
remotebranch = Git.Ref.under $ remotebranch = Git.Ref.under $