when private journal file exists, still read from git-annex branch
authorJoey Hess <joeyh@joeyh.name>
Tue, 26 Oct 2021 17:43:50 +0000 (13:43 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 26 Oct 2021 17:43:50 +0000 (13:43 -0400)
commit5a9e6b1fd42a9ac1947065cae1ac2e911292f28c
tree2da3f5d6b6ab6dbeb6ce0079763b23b74acc645c
parentc5bf4d3504f61340115e7f09c3d848562cfd4c5e
when private journal file exists, still read from git-annex branch

Fix bug that caused stale git-annex branch information to read when
annex.private or remote.name.annex-private is set.

The private journal file should not prevent reading more current
information from the git-annex branch, but used to.

Note that, overBranchFileContents has to do additional work now, when
there's a private journal file, it reads from the branch redundantly
and more slowly.

Sponsored-by: Jack Hill on Patreon
Annex/Branch.hs
Annex/Journal.hs
CHANGELOG
doc/bugs/buggy_private_special_remote.mdwn
doc/bugs/buggy_private_special_remote/comment_2_7b329362cec16146f88241e1c445ab17._comment [new file with mode: 0644]