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

fix bug introduced in recent commit

Browse source
This commit is contained in:
Joey Hess 2016-02-29 17:12:55 -04:00
parent 9731514c75
commit 9e6839fd3f
Failed to extract signature
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/Sync.hs
View file

@ -317,7 +317,7 @@ mergeRemote remote currbranch = ifM isBareRepo
) )
where where
mergelisted getlist = and <$> mergelisted getlist = and <$>
(mapM (merge currbranch Git.Branch.ManualCommit) =<< getlist) (mapM (merge currbranch Git.Branch.ManualCommit . remoteBranch remote) =<< getlist)
tomerge = filterM (changed remote) tomerge = filterM (changed remote)
branchlist Nothing = [] branchlist Nothing = []
branchlist (Just branch) = [branch, syncBranch branch] branchlist (Just branch) = [branch, syncBranch branch]