diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2018-02-22 12:31:27 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-02-22 12:31:27 -0400 |
| commit | 9cf89e71d69b8ab5f0921a1e05185c335b50aeeb (patch) | |
| tree | e38c36b3f8e122f59b9e4003b4b8886c5f230104 | |
| parent | d8555cd4ef87df8803c9752eb3b754b08b436481 (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.
3 files changed, 22 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 @@ -22,6 +22,8 @@ git-annex (6.20180113) UNRELEASED; urgency=medium * Added --json-error-messages option, which makes messages that would normally be output to standard error be included in the json output. + * Remove temporary code added in 6.20160619 to prime the mergedrefs + log. -- Joey Hess <id@joeyh.name> Wed, 24 Jan 2018 20:42:55 -0400 diff --git a/doc/bugs/impossible_to_perform___34__read-only__34___git_annex_info_without_write_permissions/comment_1_8b60c52d8fe41718377d6d15a25cae97._comment b/doc/bugs/impossible_to_perform___34__read-only__34___git_annex_info_without_write_permissions/comment_1_8b60c52d8fe41718377d6d15a25cae97._comment new file mode 100644 index 000000000..efef1a0e3 --- /dev/null +++ b/doc/bugs/impossible_to_perform___34__read-only__34___git_annex_info_without_write_permissions/comment_1_8b60c52d8fe41718377d6d15a25cae97._comment @@ -0,0 +1,20 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2018-02-22T16:17:35Z" + content=""" +The mergedrefs directory is used while building the commit to merge +git-annex branches. So even if it was written someplace else, that commit +would fail. + +I think this may be happening even when there are no +git-annex refs to merge in, due to the transition code +in Annex.Branch.updateTo that temporarily calls addMergedRefs +in the "null tomerge" case. That was added in 2016, and is flagged as able +to be safely removed. I've removed it. + +However, when there actually is a git-annex branch to merge, if a +hypothetical readonly mode avoided doing so, it would necessarily see a +different state of the git-annex branch than would be seen in non-readonly +mode. That behavior difference could be fairly confusing potentially.. +"""]] |