summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-31 02:15:13 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-31 02:15:13 -0400
commit0396f9c795749bc1ef14b26bdc1e1165b9c842b0 (patch)
tree2b1561b5068c349e5482c7b35b9ea13e09c8e975
parentf2b584ad740a95fb6ef53ae48c5a0e5fbc5c2532 (diff)
tweak
-rw-r--r--Command/Sync.hs4
1 files changed, 1 insertions, 3 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs
index 4fe5e5bc4..e29f2893f 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -140,9 +140,7 @@ mergeRemote remote branch = all id <$> mapM go [branch, syncBranch branch]
pushRemote :: Remote.Remote Annex -> Git.Ref -> CommandStart
pushRemote remote branch = go =<< needpush
where
- needpush = (||)
- <$> newer syncbranch
- <*> newer Annex.Branch.name
+ needpush = anyM newer [syncbranch, Annex.Branch.name]
newer b = do
let r = remotebranch b
e <- inRepo (Git.Ref.exists r)