mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/Annex
History
Joey Hess 43a9808292
disable journal read optimisation when alwayscommit=false 
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.
2020-04-15 13:24:33 -04:00
..
AdjustedBranch ByteString Ref continued 2020-04-07 13:27:11 -04:00
Branch fix warning 2020-02-17 15:06:28 -04:00
Content convert replaceFile to createDirectoryUnder 2020-03-06 11:31:01 -04:00
LockPool update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
MetaData update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
SpecialRemote When parsing git configs, support all the documented ways to write true and false, including "yes", "on", "1", etc. 2020-04-13 14:05:30 -04:00
View update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Action.hs make WorkerStage an open type 2019-06-19 13:05:03 -04:00
AdjustedBranch.hs Ref ByteString conversion done 2020-04-07 17:41:09 -04:00
AutoMerge.hs convert replaceFile to createDirectoryUnder 2020-03-06 11:31:01 -04:00
BloomFilter.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Branch.hs disable journal read optimisation when alwayscommit=false 2020-04-15 13:24:33 -04:00
BranchState.hs disable journal read optimisation when alwayscommit=false 2020-04-15 13:24:33 -04:00
CatFile.hs fix a case where file tracked by git unexpectedly becomes annex pointer file 2019-12-27 15:08:03 -04:00
ChangedRefs.hs ByteString Ref continued 2020-04-07 13:27:11 -04:00
CheckAttr.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
CheckIgnore.hs Removed support for git versions older than 2.1 2019-09-11 16:14:43 -04:00
Common.hs finally really add back custom-setup stanza 2017-12-31 16:36:39 -04:00
Concurrent.hs Fix a crash (STM deadlock) when -J is used with multiple files that point to the same key 2019-11-14 13:51:09 -04:00
Content.hs some easy createDirectoryUnder conversions 2020-03-05 15:20:10 -04:00
CurrentBranch.hs refactor getCurrentBranch 2018-10-19 17:29:18 -04:00
Difference.hs include git-annex-shell back in 2019-12-02 11:51:52 -04:00
DirHashes.hs use filepath-bytestring for annex object manipulations 2019-12-11 15:25:07 -04:00
Drop.hs separate RemoteConfig parsing basically working 2020-01-14 12:35:08 -04:00
Environment.hs include git-annex-shell back in 2019-12-02 11:51:52 -04:00
Export.hs Ref ByteString conversion done 2020-04-07 17:41:09 -04:00
FileMatcher.hs a few forgotten remote config fields 2020-01-15 11:22:36 -04:00
Fixup.hs Avoid converting .git file in a worktree or submodule to a symlink when the repository is not a git-annex repository. 2020-03-09 14:54:14 -04:00
GitOverlay.hs cache annex index filename for 1.5% speedup to queries 2020-04-10 13:37:04 -04:00
HashObject.hs fix a case where file tracked by git unexpectedly becomes annex pointer file 2019-12-27 15:08:03 -04:00
Hook.hs update uninit to handle all the v7 stuff 2019-10-08 14:34:00 -04:00
Import.hs Ref ByteString conversion done 2020-04-07 17:41:09 -04:00
Ingest.hs convert replaceFile to createDirectoryUnder 2020-03-06 11:31:01 -04:00
Init.hs Avoid converting .git file in a worktree or submodule to a symlink when the repository is not a git-annex repository. 2020-03-09 14:54:14 -04:00
InodeSentinal.hs use filepath-bytestring for annex object manipulations 2019-12-11 15:25:07 -04:00
Journal.hs fix fileJournal 2019-12-18 11:29:34 -04:00
Link.hs more RawFilePath 2019-12-18 17:10:28 -04:00
Locations.hs remove pre-commit hook 2020-03-30 11:54:04 -04:00
LockFile.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
LockPool.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Magic.hs Added --mimetype and --mimeencoding file matching options. 2019-09-19 12:09:59 -04:00
MetaData.hs wip RawFilePath 2x git-annex find speedup 2019-11-26 16:01:58 -04:00
Multicast.hs use programPath consistently, not readProgramFile 2020-03-30 16:06:27 -04:00
Notification.hs wip RawFilePath 2x git-annex find speedup 2019-11-26 16:01:58 -04:00
NumCopies.hs wip RawFilePath 2x git-annex find speedup 2019-11-26 16:01:58 -04:00
Path.hs use programPath consistently, not readProgramFile 2020-03-30 16:06:27 -04:00
Perms.hs refactor 2020-03-06 11:43:07 -04:00
Queue.hs remove one more warningIO 2019-11-12 10:45:52 -04:00
RemoteTrackingBranch.hs refactor 2019-11-11 19:10:52 -04:00
ReplaceFile.hs refactor 2020-03-06 11:43:07 -04:00
SpecialRemote.hs When parsing git configs, support all the documented ways to write true and false, including "yes", "on", "1", etc. 2020-04-13 14:05:30 -04:00
Ssh.hs fix windows build some more 2020-03-20 11:47:09 -04:00
TaggedPush.hs Ref ByteString conversion done 2020-04-07 17:41:09 -04:00
Tmp.hs init: Fix a reversion that broke initialization on systems that need to use pid locking 2019-09-10 13:37:07 -04:00
Transfer.hs cache the serialization of a Key 2019-11-22 17:49:16 -04:00
UpdateInstead.hs v7 for all repositories 2019-08-30 14:09:14 -04:00
Url.hs annex.security.allowed-ip-addresses ports syntax 2020-02-25 15:45:52 -04:00
UUID.hs Fix a potential failure to parse git config 2020-04-13 13:05:41 -04:00
VariantFile.hs more RawFilePath 2019-12-18 17:10:28 -04:00
VectorClock.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Version.hs jump right to v8, don't stop part way 2020-02-24 13:21:00 -04:00
View.hs cache annex index filename for 1.5% speedup to queries 2020-04-10 13:37:04 -04:00
Wanted.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
WorkTree.hs convert replaceFile to createDirectoryUnder 2020-03-06 11:31:01 -04:00
YoutubeDl.hs make --json-error-messages capture url download errors 2019-11-12 13:52:38 -04:00