diff options
Diffstat (limited to 'Annex/Branch.hs')
| -rw-r--r-- | Annex/Branch.hs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index 070f8ff98..36cfb8b55 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -140,7 +140,13 @@ forceUpdate = updateTo =<< siblingBranches - Returns True if any refs were merged in, False otherwise. -} updateTo :: [(Git.Sha, Git.Branch)] -> Annex Bool -updateTo pairs = do +updateTo pairs = ifM (annexMergeAnnexBranches <$> Annex.getGitConfig) + ( updateTo' pairs + , return False + ) + +updateTo' :: [(Git.Sha, Git.Branch)] -> Annex Bool +updateTo' pairs = do -- ensure branch exists, and get its current ref branchref <- getBranch dirty <- journalDirty |