From f2b584ad740a95fb6ef53ae48c5a0e5fbc5c2532 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 31 Dec 2011 02:03:39 -0400 Subject: fix check that remote branch needs merged --- Command/Sync.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Command/Sync.hs') 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 $ -- cgit v1.2.3