diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-31 02:03:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-31 02:03:39 -0400 |
| commit | f2b584ad740a95fb6ef53ae48c5a0e5fbc5c2532 (patch) | |
| tree | a234481058bc703659db1834abb352cb18550933 | |
| parent | 79231bcff07fce6c08f2266b1e34e8090b12233e (diff) | |
fix check that remote branch needs merged
| -rw-r--r-- | Command/Sync.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index 052f54c44..4fe5e5bc4 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -130,8 +130,8 @@ mergeRemote :: Remote.Remote Annex -> Git.Ref -> CommandCleanup mergeRemote remote branch = all id <$> mapM go [branch, syncBranch branch] where go b = do - e <- inRepo $ Git.Branch.changed branch b - if e + c <- inRepo $ Git.Branch.changed b (remotebranch b) + if c then mergeFrom $ remotebranch b else return True remotebranch = Git.Ref.under $ |