From dfbc04a49807ab525f27f8cfe5b16ee9e4423c83 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Feb 2016 17:12:55 -0400 Subject: fix bug introduced in recent commit --- Command/Sync.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Command/Sync.hs b/Command/Sync.hs index bebe11355..927ad8390 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -317,7 +317,7 @@ mergeRemote remote currbranch = ifM isBareRepo ) where mergelisted getlist = and <$> - (mapM (merge currbranch Git.Branch.ManualCommit) =<< getlist) + (mapM (merge currbranch Git.Branch.ManualCommit . remoteBranch remote) =<< getlist) tomerge = filterM (changed remote) branchlist Nothing = [] branchlist (Just branch) = [branch, syncBranch branch] -- cgit v1.2.3