mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

disable journal read optimisation when alwayscommit=false

Browse source 
The journal read optimisation in aeca7c220 later got fixed in eedd73b84
to stage and commit any files that were left in the journal by a
previous git-annex run. That's necessary for the optimisation to work
correctly. But it also meant that alwayscommit=false started committing
the previous git-annex processes journalled changes, which defeated the
purpose of the config setting entirely.

So, disable the optimisation when alwayscommit=false, leaving the
files in the journal and not committing them. See my comments on the bug
report for why this seemed the best approach.

Also fixes a problem when annex.merge-annex-branches=false and there
are changes in the journal. That config indirectly prevents committing
the journal. (Which seems a bit odd given its name, but it always has..)
So, when there were changes in the journal, perhaps left there due to
alwayscommit=false being set before, the optimisation would prevent
git-annex from reading the journal files, and it would operate with out
of date information.
This commit is contained in:
Joey Hess 2020-04-15 13:04:34 -04:00
parent 0e4c92503e
commit 43a9808292
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 46 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/commits_created_despite_alwayscommit__61__false_as_of_recent_change.mdwn
View file

@ -91,3 +91,5 @@ index 712c5c10f..f248b3eb4 100644
[[!tag projects/datalad]]
[0]: https://github.com/datalad/datalad-extensions/pull/9
> [[fixed|done]] --[[Joey]]