mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
13888 commits 13 branches 445 tags 112 MiB
Commit graph

13888 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
f278ff7246 update backport 2013-10-03 17:31:35 +00:00
Joey Hess
407a267344 tag for 4.20130920 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIVAwUAUkmfockQ2SIlEuPHAQgeJg/+K/7al7SOug++YGke/LArj1RBgzh3KktA
 vJhZjLsFvEpESFvn4QBFyEkpqYVZGyy6VeTRxuC+YDwwj/W2Ouo5qTPcy0mC8Mel
 RiNx5qbs9fCjlh5WgPoMfNoXzPVbGt9niTmILcrem6RJig4U4jMIbx/fgdJ69C7o
 w7Z2+htvshok/yd69xM+YWZgU63FxiQSgWRBso5oDz13Cqly+TJM4TQQhZqmxUax
 r5pIeaAsePEIAHkXgB5bOcu0qPVcEa/Xh31RNpaJPdkI6jdd1VHxz6WigkvrI0sM
 DJyl2aQfhqZpHj4KFQQbfsQbZV22Ld8lXBHFsAm8Atv3sM8SVKALLDkcheJLf3xQ
 AxEkWe+Ry4sOz1cHgsOn5WzCPyZ8us+Hy2MKCbkz+yX7iTTWaHR/4R3mINE/WxTt
 7s7fgUS6sXaZ79YuEPqdndtGU3BneQ5JEGJiFPh9W67gucgzEDHboaXJcq9kGcyj
 Wt7D5t/1IzwwKI8/EyHZHyXOOGQ0mjferNcK2R4s3WkY/zEe49VXfdziEZVorh8U
 yFdhv0RTIhwkwUZU5jpW0zSQ0+0RIeYTHeXN6HnUf/tk3fyaD4z+mjmUMstTA8Ds
 ZMx8961d7T4+BoLOaVsdujJ8Bkd6TL0E4XBBaiuMPrhdIx1tNPTD7fRF8NBYFDvH
 o7S/I8k1ab0=
 =pgDx
 -----END PGP SIGNATURE-----

Merge tag '4.20130920' into debian-wheezy-backport

tag for 4.20130920

# gpg: Signature made Mon Sep 30 16:58:25 2013 BST using RSA key ID 2512E3C7
# gpg: Can't check signature: public key not found
 2013-10-03 18:30:23 +01:00
Joey Hess
70f205717c release 2013-09-20 10:43:08 -04:00
Joey Hess
a7f8e957a8 Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-20 10:34:41 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm7AuSfii_tCkLyspL6Mr0ATlO6OxLNYOo
746fd0ea74 Added a comment 2013-09-20 11:29:04 +00:00
Joey Hess
7fdc8311f6 note 2013-09-20 00:04:37 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
48e517ddf9 Added a comment 2013-09-20 02:41:22 +00:00
Joey Hess
9be7762bdb Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-19 21:42:24 -04:00
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