Commit graph

14069 commits

Author SHA1 Message Date
Joey Hess
55636bf92f list --allrepos 2013-09-19 21:42:03 -04:00
http://joeyh.name/
7c1c2d25b0 Added a comment 2013-09-20 00:15:07 +00:00
Joey Hess
51d5c1d032 remove possibly confusing mention of git commit -a in sync documentation
http://git-annex.branchable.com/forum/git-annex_pre-commit_eats_all_my_4GB_of_ram/#comment-f7523e3779794a03680dbf48a488abc0
2013-09-19 20:13:58 -04:00
Joey Hess
5256ed462c Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-19 20:10:59 -04:00
Joey Hess
3588729f0d completely solve catKey memory leak
Since 006cf7976f 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.
2013-09-19 20:09:03 -04:00
ringprince
24ce78a8a4 Added a comment 2013-09-19 22:27:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
882b076792 Added a comment 2013-09-19 22:22:03 +00:00
Joey Hess
26cb834eab devblog 2013-09-19 17:10:49 -04:00
Joey Hess
a5998619c7 Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-19 17:08:15 -04:00
http://joeyh.name/
475270f401 Added a comment 2013-09-19 21:07:35 +00:00
http://joeyh.name/
591d6a3281 Added a comment 2013-09-19 21:01:30 +00:00
http://joeyh.name/
b764f52b51 Added a comment 2013-09-19 20:59:32 +00:00
http://joeyh.name/
1f28ae3795 Added a comment 2013-09-19 20:57:19 +00:00
Joey Hess
006cf7976f more completely solve catKey memory leak
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.
2013-09-19 16:41:21 -04:00
ringprince
ea5ff63c0f Added a comment 2013-09-19 20:06:39 +00:00
Joey Hess
f26c996dc6 interface to parse git tree objects 2013-09-19 15:58:35 -04:00
http://joeyh.name/
cf756ff7b3 Added a comment 2013-09-19 19:07:04 +00:00
http://joeyh.name/
5d4a568478 Added a comment 2013-09-19 18:59:42 +00:00
http://joeyh.name/
a618301675 Added a comment: Ed's right 2013-09-19 18:56:39 +00:00
http://joeyh.name/
7e317bcf03 Added a comment 2013-09-19 18:53:14 +00:00
http://joeyh.name/
d40584c636 Added a comment 2013-09-19 18:49:05 +00:00
Joey Hess
eb42bde19a sync, pre-commit, indirect: Avoid unnecessarily catting non-symlink files from git, which can be so large it runs out of memory. 2013-09-19 14:48:42 -04:00
Joey Hess
66b6a9cc4e credit 2013-09-19 14:27:07 -04:00
Joey Hess
3f8151d469 Merge remote-tracking branch 'anarcat/master' 2013-09-19 14:23:19 -04:00
Joey Hess
03729dc2a5 Merge remote-tracking branch 'anarcat/bold' 2013-09-19 14:22:46 -04:00
Joey Hess
53f2dc29ae Merge remote-tracking branch 'anarcat/indent_fix' 2013-09-19 14:22:19 -04:00
Antoine Beaupré
f4e8b70bba rename remotes to list 2013-09-19 14:16:55 -04:00
Joey Hess
0831a22c25 formatting 2013-09-19 14:06:38 -04:00
http://joeyh.name/
ba640c3507 Added a comment 2013-09-19 18:03:29 +00:00
http://joeyh.name/
c414c189b9 Added a comment 2013-09-19 17:57:22 +00:00
http://joeyh.name/
69f4179c81 Added a comment 2013-09-19 17:41:47 +00:00
Joey Hess
7e40153629 Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-19 13:33:22 -04:00
Joey Hess
94fd1eb3d5 guard against runshell loop 2013-09-19 13:33:00 -04:00
http://joeyh.name/
6e82873004 Added a comment 2013-09-19 17:31:46 +00:00
http://joeyh.name/
015bf79399 Added a comment 2013-09-19 17:12:39 +00:00
Joey Hess
555402f26b Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-19 12:55:34 -04:00
Joey Hess
e8e209f4e5 better probing for gcrypt repositories using new --check option
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.
2013-09-19 12:53:24 -04:00
http://churchkey.org/author/ian/
452d67a5fd Added a comment: Same problem, different user 2013-09-18 22:20:11 +00:00
Joey Hess
b847d24992 typo 2013-09-18 16:12:45 -04:00
Joey Hess
b3d83223b0 typo 2013-09-18 16:11:59 -04:00
Joey Hess
736438cc3f devblog 2013-09-18 16:10:23 -04:00
Joey Hess
1a349eeaff Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-18 16:00:38 -04:00
Joey Hess
8062f6337f webapp: support adding existing gcrypt special remotes from removable drives
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.
2013-09-18 15:55:31 -04:00
ringprince
2db03b7f84 Added a comment 2013-09-18 12:27:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmWg4VvDTer9f49Y3z-R0AH16P4d1ygotA
5d46492ee3 Added a comment: Update 2013-09-18 11:17:34 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
b2a72922d8 Added a comment 2013-09-18 07:19:50 +00:00
http://nullroute.eu.org/~grawity/
f82ccaca0a Added a comment 2013-09-18 05:00:13 +00:00
Joey Hess
c6559e5d86 devblog 2013-09-17 20:08:57 -04:00
Joey Hess
76421872d1 notes 2013-09-17 20:08:44 -04:00
Joey Hess
3d88559e58 webapp: Show encryption information when editing a remote. 2013-09-17 20:02:42 -04:00