summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* Added a commentGravatar wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d2016-01-10
|
* Added a comment: What do you mean by "git-annex" branch?Gravatar G.nius.ck@d885edcfde63422ee84e5ee501b7aa545e91298d2016-01-09
|
* Added a comment: Copy from .git/configGravatar https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf5742016-01-09
|
* Added a comment: Special remotesGravatar mark@6b90344cdab3158eacb94a3944460d138afc9bef2016-01-08
|
* linkGravatar Joey Hess2016-01-08
|
* layoutGravatar Joey Hess2016-01-08
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-01-08
|\
* | devblogGravatar Joey Hess2016-01-08
| |
* | updateGravatar Joey Hess2016-01-08
| |
* | defer deletion of test repos until end, fixes sqlite crashGravatar Joey Hess2016-01-08
| | | | | | | | | | | | | | | | The crash turned out to be caused by the sqlite database being deleted out from under sqlite before it was done with it. Since multiple git_annex calls are done in the same process while running the test suite, the DbHandle could linger until GCed, and the test repo, and thus sqlite database be deleted before the workerThread was done.
* | fix one more test failure with v6 unlocked file merge conflict resolutionGravatar Joey Hess2016-01-08
| |
| * Added a commentGravatar oliverconzen@8cff8c5ab3868de177f748566f90c79720f9cf4b2016-01-08
|/
* better fix for slash in view metadataGravatar Joey Hess2016-01-08
| | | | | | | | | The homomorphs are back, just encoded such that it doesn't crash in LANG=C However, I noticed a bug in the old escaping; [pseudoSlash] was escaped the same as ['/','/']. Fixed by using '%' to escape pseudoSlash. Which requires doubling '%' to escape it, but that's already done in the escaping of worktree filenames in a view, so is probably ok.
* view: Avoid using cute unicode homomorphs for '/' and '\' and instead use ↵Gravatar Joey Hess2016-01-08
| | | | ugly escaping, as the unicode method doesn't work on non-unicode supporting systems.
* link to new tip about encryptionGravatar Joey Hess2016-01-08
|
* (no commit message)Gravatar Alan2016-01-08
|
* (no commit message)Gravatar wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d2016-01-08
|
* Added a commentGravatar anntzer.lee@b6e099b6ef8ba8b53005ca7f0e473e825001129b2016-01-08
|
* Added a comment: bump!Gravatar sameerds2016-01-08
|
* Added a commentGravatar wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d2016-01-08
|
* (no commit message)Gravatar philippgodbersen@b5b6f1c85f129c3bbf300214eb690810f9c582b62016-01-07
|
* responseGravatar Joey Hess2016-01-07
|
* rekey: No longer copies over urls from the old to the new key.Gravatar Joey Hess2016-01-07
| | | | | It makes sense for migrate to do that, but not for this low-level (and little used) plumbing command to.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-01-07
|\
* | devblogGravatar Joey Hess2016-01-07
| |
* | avoid confusing git with a modified ctime in clean filterGravatar Joey Hess2016-01-07
| | | | | | | | | | | | | | Linking the file to the tmp dir was not necessary in the clean filter, and it caused the ctime to change, which caused git to think the file was changed. This caused git status to get slow as it kept re-cleaning unchanged files.
* | fix inverted logic in old associated files cleanupGravatar Joey Hess2016-01-07
| |
* | updateGravatar Joey Hess2016-01-07
| |
* | fix broken testGravatar Joey Hess2016-01-07
| |
* | migrate and rekey v6 unlocked file supportGravatar Joey Hess2016-01-07
| |
* | migrate: Copy over metadata to new key.Gravatar Joey Hess2016-01-07
| |
| * Added a commentGravatar grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f2016-01-07
|/
* unused: deal with v6 unlocked file that is implicitly ingested by git diff etcGravatar Joey Hess2016-01-06
|
* force hash to finish with file before returningGravatar Joey Hess2016-01-06
| | | | | | Fixes a minor fd leak, never more than 1 in normal use, which broke the test suite when I tried to write to a file that was still open for a previous hashing.
* cleanupGravatar Joey Hess2016-01-06
|
* optimiseGravatar Joey Hess2016-01-06
| | | | | | | | | | | | d1ce927d95fe7c331cbff3317797a60aa288738b put a cat-file into the fast bloomfilter generation path. Instead, add another bloom filter which diffs from the work tree to the index. Also, pull the sha of the changed object out of the diffs, and cat that object directly, rather than indirecting through the filename. Finally, removed some hacks that are unncessary thanks to the worktree to index diff.
* fix parsing of v6 unlocked fileGravatar Joey Hess2016-01-06
| | | | The newline broke this ad-hoc parser; use the normal one.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-01-06
|\
* | unused: Bug fix when a new file was added to the annex, and then removed ↵Gravatar Joey Hess2016-01-06
| | | | | | | | | | | | | | | | (but not git rmed). git still has the add staged in this case, so the content should not be unused and was wrongly treated as such. So, we need to look at both the file on disk to see if it's a annex link, and the file in the index too. lookupFile doesn't look in the index if the file is not present on disk.
* | skip fix test in unlocked v6 passGravatar Joey Hess2016-01-06
| | | | | | | | fix is not relevant for unlocked files
* | fix testGravatar Joey Hess2016-01-06
| | | | | | | | | | | | | | have to change the content of unlocked file before committing otherwise git commit will fail in v6 mode when the file was already unlocked, because no changes have been made
* | fix testGravatar Joey Hess2016-01-06
| | | | | | | | file is locked here, so use right test.
* | fix test failure locking an unlocked not present fileGravatar Joey Hess2016-01-06
| | | | | | | | | | | | | | | | In v5, that was not possible, but it is in v6, and so the test was failing. Investigating, it turns out that locking was copying the pointer file content to the annex object despite the content not being present. So, add a check to prevent that.
* | test: Added --keep-failures option.Gravatar Joey Hess2016-01-06
| |
| * Added a commentGravatar ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a96262016-01-06
|/
* whereis --json: Make url list be included in machine-parseable form.Gravatar Joey Hess2016-01-06
|
* responseGravatar Joey Hess2016-01-06
|
* (no commit message)Gravatar mark@6b90344cdab3158eacb94a3944460d138afc9bef2016-01-05
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-01-05
|\
* | updateGravatar Joey Hess2016-01-05
| |