summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* release4.20130920Gravatar Joey Hess2013-09-20
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-09-20
|\
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawm7AuSfii_tCkLyspL6Mr0ATlO6OxLNYOo2013-09-20
| |
* | noteGravatar Joey Hess2013-09-20
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ2013-09-20
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-09-19
|\
* | list --allreposGravatar Joey Hess2013-09-19
| |
| * Added a commentGravatar http://joeyh.name/2013-09-20
|/
* remove possibly confusing mention of git commit -a in sync documentationGravatar Joey Hess2013-09-19
| | | | http://git-annex.branchable.com/forum/git-annex_pre-commit_eats_all_my_4GB_of_ram/#comment-f7523e3779794a03680dbf48a488abc0
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-09-19
|\
* | completely solve catKey memory leakGravatar Joey Hess2013-09-19
| | | | | | | | | | | | | | | | | | | | | | Since 4aaa584eb632a981f5364c844f9293d4cdedaa65 was incomplete, not being able to get the right mode of the file when the index differs from HEAD, this is a final workaround. Only buffering the start of the file in this case avoids leaking memory. This does not prevent git-cat-file being asked to output the whole file, which needs to be consumed, and can be slow. But this only happens in a rare edge case.
| * Added a commentGravatar ringprince2013-09-19
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ2013-09-19
|/
* devblogGravatar Joey Hess2013-09-19
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-09-19
|\
| * Added a commentGravatar http://joeyh.name/2013-09-19
| |
| * Added a commentGravatar http://joeyh.name/2013-09-19
| |
| * Added a commentGravatar http://joeyh.name/2013-09-19
| |
| * Added a commentGravatar http://joeyh.name/2013-09-19
| |
* | more completely solve catKey memory leakGravatar Joey Hess2013-09-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done using a mode witness, which ensures it's fixed everywhere. Fixing catFileKey was a bear, because git cat-file does not provide a nice way to query for the mode of a file and there is no other efficient way to do it. Oh, for libgit2.. Note that I am looking at tree objects from HEAD, rather than the index. Because I cat-file cannot show a tree object for the index. So this fix is technically incomplete. The only cases where it matters are: 1. A new large file has been directly staged in git, but not committed. 2. A file that was committed to HEAD as a symlink has been staged directly in the index. This could be fixed a lot better using libgit2.
| * Added a commentGravatar ringprince2013-09-19
| |
* | interface to parse git tree objectsGravatar Joey Hess2013-09-19
| |
| * Added a commentGravatar http://joeyh.name/2013-09-19
| |
| * Added a commentGravatar http://joeyh.name/2013-09-19
| |
| * Added a comment: Ed's rightGravatar http://joeyh.name/2013-09-19
| |
| * Added a commentGravatar http://joeyh.name/2013-09-19
| |
| * Added a commentGravatar http://joeyh.name/2013-09-19
|/
* sync, pre-commit, indirect: Avoid unnecessarily catting non-symlink files ↵Gravatar Joey Hess2013-09-19
| | | | from git, which can be so large it runs out of memory.
* creditGravatar Joey Hess2013-09-19
|
* Merge remote-tracking branch 'anarcat/master'Gravatar Joey Hess2013-09-19
|\
* \ Merge remote-tracking branch 'anarcat/bold'Gravatar Joey Hess2013-09-19
|\ \
* \ \ Merge remote-tracking branch 'anarcat/indent_fix'Gravatar Joey Hess2013-09-19
|\ \ \
| | | * rename remotes to listGravatar Antoine Beaupré2013-09-19
| |_|/ |/| |
* | | formattingGravatar Joey Hess2013-09-19
| | |
* | | Added a commentGravatar http://joeyh.name/2013-09-19
| | |
* | | Added a commentGravatar http://joeyh.name/2013-09-19
| | |
* | | Added a commentGravatar http://joeyh.name/2013-09-19
| | |
* | | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-09-19
|\ \ \
* | | | guard against runshell loopGravatar Joey Hess2013-09-19
| | | |
| * | | Added a commentGravatar http://joeyh.name/2013-09-19
| | | |
| * | | Added a commentGravatar http://joeyh.name/2013-09-19
|/ / /
* | | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-09-19
|\ \ \
* | | | better probing for gcrypt repositories using new --check optionGravatar Joey Hess2013-09-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now can tell if a repo uses gcrypt or not, and whether it's decryptable with the current gpg keys. This closes the hole that undecryptable gcrypt repos could have before been combined into the repo in encrypted mode.
| * | | Added a comment: Same problem, different userGravatar http://churchkey.org/author/ian/2013-09-18
|/ / /
* | | typoGravatar Joey Hess2013-09-18
| | |
* | | typoGravatar Joey Hess2013-09-18
| | |
* | | devblogGravatar Joey Hess2013-09-18
| | |
* | | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-09-18
|\ \ \
* | | | webapp: support adding existing gcrypt special remotes from removable drivesGravatar Joey Hess2013-09-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding a removable drive, it's now detected if the drive contains a gcrypt special remote, and that's all handled nicely. This includes fetching the git-annex branch from the gcrypt repo in order to find out how to set up the special remote. Note that gcrypt repos that are not git-annex special remotes are not supported. It will attempt to detect such a gcrypt repo and refuse to use it. (But this is hard to do any may fail; see https://github.com/blake2-ppc/git-remote-gcrypt/issues/6) The problem with supporting regular gcrypt repos is that we don't know what the gcrypt.participants setting is intended to be for the repo. So even if we can decrypt it, if we push changes to it they might not be visible to other participants. Anyway, encrypted sneakernet (or mailnet) is now fully possible with the git-annex assistant! Assuming that the gpg key distribution is handled somehow, which the assistant doesn't yet help with. This commit was sponsored by Navishkar Rao.
| * | | Added a commentGravatar ringprince2013-09-18
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-29 03:57:42 +0000