diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-29 17:12:55 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-29 17:12:55 -0400 |
| commit | dfbc04a49807ab525f27f8cfe5b16ee9e4423c83 (patch) | |
| tree | e368f384896dd8935502b71b9d07a3d3db3e94bb /Command/Sync.hs | |
| parent | 927fb6ca6298a15e8f4199618d7f3997573c7d0a (diff) | |
fix bug introduced in recent commit
Diffstat (limited to 'Command/Sync.hs')
| -rw-r--r-- | Command/Sync.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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] |