summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* noteGravatar Joey Hess2016-10-17
|
* commentGravatar Joey Hess2016-10-17
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-10-17
|\
* | lock: Fix edge cases where data loss could occur in v6 mode.Gravatar Joey Hess2016-10-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case where the pointer file is in place, and not the content of the object, lock's performNew was called with filemodified=True, which caused it to try to repopulate the object from an unmodified associated file, of which there were none. So, the content of the object got thrown away incorrectly. This was the cause (although not the root cause) of data loss in https://github.com/datalad/datalad/issues/1020 The same problem could also occur when the work tree file is modified, but the object is not, and lock is called with --force. Added a test case for this, since it's excercising the same code path and is easier to set up than the problem above. Note that this only occurred when the keys database did not have an inode cache recorded for the annex object. Normally, the annex object would be in there, but there are of course circumstances where the inode cache is out of sync with reality, since it's only a cache. Fixed by checking if the object is unmodified; if so we don't need to try to repopulate it. This does add an additional checksum to the unlock path, but it's already checksumming the worktree file in another case, so it doesn't slow it down overall. Further investigation found a similar problem occurred when smudge --clean is called on a file and the inode cache is not populated. cleanOldKeys deleted the unmodified old object file in this case. This was also fixed by checking if the object is unmodified. In general, use of getInodeCaches and sameInodeCache is potentially dangerous if the inode cache has not gotten populated for some reason. Better to use isUnmodified. I breifly auited other places that check the inode cache, and did not see any immediate problems, but it would be easy to miss this kind of problem.
| * original whiningGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-10-17
| |
| * added meta for myselfGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-10-17
| |
| * initial suggestionGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-10-17
| |
| * Git Annex Assistant occasionally replaces files with dangling symlinks.Gravatar ryan@d4f0c2d3daacb5ec3a2945bca06f66decad4bfb52016-10-15
| |
| * Added a comment: Dumb old me....Gravatar https://launchpad.net/~helpunclejackoff2016-10-15
| |
| * Added a commentGravatar https://launchpad.net/~stephane-gourichon-lpad2016-10-14
| |
| * Added a comment: git-annex-undo removes files, possibly destroying ↵Gravatar https://launchpad.net/~stephane-gourichon-lpad2016-10-14
| | | | | | | | information? Please explain.
| * fix typoGravatar edward2016-10-13
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-10-13
|\
* | commentGravatar Joey Hess2016-10-13
| |
| * Added a comment: real happy about optimisations!Gravatar https://anarc.at/openid/2016-10-12
|/
* add news item for git-annex 6.20161012Gravatar Joey Hess2016-10-12
|
* releasing package git-annex version 6.201610126.20161012Gravatar Joey Hess2016-10-12
|
* Added a commentGravatar barthalion@8758f91921f1def00205716519c57234f128c3282016-10-11
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-10-11
|\
* | devblogGravatar Joey Hess2016-10-11
| |
* | fix tree graft-in bugGravatar Joey Hess2016-10-11
| | | | | | | | | | | | | | | | | | | | | | When adding a tree like a/b/c/d when a/b already exists, fixes the bug that the tree that got created was a/b/a/b/c/d Just need to flatten out the top N directories of the tree that's being grafted in, so we get the c/d part. This was complicated by the Tree data type being a rose tree rather than a regular tree. This commit was sponsored by Nick Daly on Patreon.
* | add test case for sync_in_adjusted_branch_deleted_recently_added_filesGravatar Joey Hess2016-10-11
| | | | | | | | This commit was sponsored by Denis Dzyubenko on Patreon.
| * Added a comment: related workGravatar fiatjaf2016-10-11
|/
* devblogGravatar Joey Hess2016-10-10
|
* sync: Fix bug in adjusted branch merging that could cause recently added ↵Gravatar Joey Hess2016-10-10
| | | | | | | | | | | files to be lost when updating the adjusted branch. The modification flag was not being set when making modifications deep in a tree, so parent trees were not updated to contain the modified tree. Seems to have exposed another bug where the wrong filename gets grafted in. This commit was sponsored by Brock Spratlen on Patreon.
* more analysisGravatar Joey Hess2016-10-10
|
* reproduce recipeGravatar Joey Hess2016-10-10
|
* Added a comment: Build on Debian 7.11 AMD64Gravatar https://launchpad.net/~stephane-gourichon-lpad2016-10-10
|
* (no commit message)Gravatar https://launchpad.net/~helpunclejackoff2016-10-09
|
* Move the env description to the right placeGravatar https://launchpad.net/~helpunclejackoff2016-10-09
|
* (no commit message)Gravatar https://launchpad.net/~helpunclejackoff2016-10-09
|
* Added a comment: Workflow SummaryGravatar xloem2016-10-09
|
* Added a commentGravatar xloem2016-10-09
|
* Reporting missing file in locally installed doc causing reduced reading comfort.Gravatar https://launchpad.net/~stephane-gourichon-lpad2016-10-09
|
* Added a comment: Compression levelGravatar barthalion@8758f91921f1def00205716519c57234f128c3282016-10-08
|
* Added a commentGravatar Tafnzart2016-10-08
|
* (no commit message)Gravatar jwm@affa977977673476597d5d5c7bda464959a9bd9b2016-10-08
|
* (no commit message)Gravatar Tafnzart2016-10-07
|
* rename ↵Gravatar http://christian.amsuess.com/chrysn2016-10-07
| | | | forum/bittorrent__58___support_offline_operation_and_verification.mdwn to todo/bittorrent__58___support_offline_operation_and_verification.mdwn
* suggest bittorrent enhancementsGravatar http://christian.amsuess.com/chrysn2016-10-07
|
* Added a commentGravatar yomguy2016-10-07
|
* Added a comment: Re: attaching a torrent file to a downloaded and annexed ↵Gravatar http://christian.amsuess.com/chrysn2016-10-07
| | | | directory
* (no commit message)Gravatar pot2016-10-06
|
* Added a comment: 780 source files....Gravatar pot2016-10-06
|
* Added a commentGravatar ddenis2016-10-06
|
* Added a commentGravatar jk@3f2b4ce16bbac41470815333505aa47b91b7a9a62016-10-06
|
* devblogGravatar Joey Hess2016-10-05
|
* responseGravatar Joey Hess2016-10-05
|
* commentGravatar Joey Hess2016-10-05
|
* Support using v3 repositories without upgrading them to v5.Gravatar Joey Hess2016-10-05
| | | | | | | An easy change now that supportedVersions is a list. Since v3 and v5 are identical other than version number, just add v3 to the list. This commit was sponsored by andrea rota.