summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2018-02-22 12:31:27 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2018-02-22 12:31:27 -0400
commit9cf89e71d69b8ab5f0921a1e05185c335b50aeeb (patch)
treee38c36b3f8e122f59b9e4003b4b8886c5f230104 /Annex
parentd8555cd4ef87df8803c9752eb3b754b08b436481 (diff)
Remove temporary code added in 6.20160619 to prime the mergedrefs log.
Repositories that are upgraded from before that version to this one will not break, but will just not see the benefit of the mergedrefs log speeding things up, until one new ref gets merged in.
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Branch.hs4
1 files changed, 0 insertions, 4 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index c8f2f4c2f..070f8ff98 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -163,10 +163,6 @@ updateTo pairs = do
- a commit needs to be done. -}
when dirty $
go branchref True [] jl
- {- Only needed for a while, to populate the
- - newly added merged refs cache with already
- - merged refs. Can be safely removed at any time. -}
- addMergedRefs unignoredrefs
else lockJournal $ go branchref dirty tomerge
return $ not $ null tomerge
where