mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2014-08-01 17:56:57 -04:00
commit 370c01811f
10 changed files with 105 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
doc/bugs/googlemail/comment_1_5614fa85029f9f97be03cb74899a7099._comment Normal file
View file

@ -0,0 +1,19 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawm8BAEUyzYhORZmMuocRTk4M-3IumDm5VU"
nickname="luciusf0"
subject="Bug still valid"
date="2014-07-31T08:35:29Z"
content="""
The bug is still valid. A lot of german users had to use the @googlemail.com extension as google couldn't get the gmail domain in Germany.
So it might be bothering not just a few people, but a whole country! Now, if that doesn't count ...
Mac OSX 10.9.4
Version: 5.20140717-g5a7d4ff
Build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
This is the message I get
Unable to connect to the Jabber server. Maybe you entered the wrong password? (Error message: host xmpp.l.google.com.:5222 failed: AuthenticationFailure (Element {elementName = Name {nameLocalName = \"failure\", nameNamespace = Just \"urn:ietf:params:xml:ns:xmpp-sasl\", namePrefix = Nothing}, elementAttributes = [], elementNodes = [NodeElement (Element {elementName = Name {nameLocalName = \"not-authorized\", nameNamespace = Just \"urn:ietf:params:xml:ns:xmpp-sasl\", namePrefix = Nothing}, elementAttributes = [], elementNodes = []})]}); host alt2.xmpp.l.google.com.:5222 failed: AuthenticationFailure (Element {elementName = Name {nameLocalName = \"failure\", nameNamespace = Just \"urn:ietf:params:xml:ns:xmpp-sasl\", namePrefix = Nothing}, elementAttributes = [], elementNodes = [NodeElement (Element {elementName = Name {nameLocalName = \"not-authorized\", nameNamespace = Just \"urn:ietf:params:xml:ns:xmpp-sasl\", namePrefix = Nothing}, elementAttributes = [], elementNodes = []})]}); host alt1.xmpp.l.google.com.:5222 failed: AuthenticationFailure (Element {elementName = Name {nameLocalName = \"failure\", nameNamespace = Just \"urn:ietf:params:xml:ns:xmpp-sasl\", namePrefix = Nothing}, elementAttributes = [], elementNodes = [NodeElement (Element {elementName = Name {nameLocalName = \"not-authorized\", nameNamespace = Just \"urn:ietf:params:xml:ns:xmpp-sasl\", namePrefix = Nothing}, elementAttributes = [], elementNodes = []})]}); host alt4.xmpp.l.google.com.:5222 failed: AuthenticationFailure (Element {elementName = Name {nameLocalName = \"failure\", nameNamespace = Just \"urn:ietf:params:xml:ns:xmpp-sasl\", namePrefix = Nothing}, elementAttributes = [], elementNodes = [NodeElement (Element {elementName = Name {nameLocalName = \"not-authorized\", nameNamespace = Just \"urn:ietf:params:xml:ns:xmpp-sasl\", namePrefix = Nothing}, elementAttributes = [], elementNodes = []})]}); host alt3.xmpp.l.google.com.:5222 failed: AuthenticationFailure (Element {elementName = Name {nameLocalName = \"failure\", nameNamespace = Just \"urn:ietf:params:xml:ns:xmpp-sasl\", namePrefix = Nothing}, elementAttributes = [], elementNodes = [NodeElement (Element {elementName = Name {nameLocalName = \"not-authorized\", nameNamespace = Just \"urn:ietf:params:xml:ns:xmpp-sasl\", namePrefix = Nothing}, elementAttributes = [], elementNodes = []})]}))
"""]]

8
doc/bugs/runs_of_of_memory_adding_2_million_files/comment_8_7264b57f309d6e824c612eed8a088327._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis"
nickname="Mike"
subject="comment 8"
date="2014-07-30T20:33:44Z"
content="""
Great work Joeyh :-) I will install the new version soon. I is fantastic that you fixed this so thoroughly.
"""]]

10
doc/forum/Central_git_annex_server_that_always_keeps_one_copy/comment_1_e786c8df6e48d88cf15b555af1b8639a._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawn-TDneVW-8kwb1fyTRAJfH3l1xs2VSEmk"
nickname="James"
subject="comment 1"
date="2014-07-30T20:37:27Z"
content="""
It might not suit all your needs but you could try using gitolite and set permissions on the git-annex branch of your repository
http://gitolite.com/gitolite/conf.html#write-types
"""]]

3
doc/forum/Making_Firefox_not_dereference_symlinks_on_open.mdwn Normal file
View file

@ -0,0 +1,3 @@
Firefox has the nasty habit that it will force-dereference symlinks when locally opening files (i. e., opening an annexed document will cause it to be opened in .git/annex/objects/…). Since this will break relative links within HTML files, this would make Firefox pretty useless when working with a git annex containing HTML files. (Apparently this behavior is [desired](https://bugzilla.mozilla.org/show_bug.cgi?id=803999) upstream and might not be fixed.)
Seems I’m not the only one who would like to work with annexed HTML files, though. On the [Debian bugtracker](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=691099), another user shared a handy shim which can be used in LD_PRELOAD and which will force Firefox to open symlinks in-place. Thought I’d share this here in case it’s of use to anyone.

8
doc/forum/Making_Firefox_not_dereference_symlinks_on_open/comment_1_a7b092f2291fa515279cf7dce23df20d._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="zardoz"
ip="78.48.163.229"
subject="comment 1"
date="2014-07-31T11:43:16Z"
content="""
Sorry, it escaped my attention there’s a dedicated tips forum. Maybe this should be moved there.
"""]]

20
doc/forum/shared_cipher_for_S3_attempting_to_decrypt_a_non-encrypted_file.mdwn Normal file
View file

@ -0,0 +1,20 @@
I am trying to S3 as a file store for git annex. I have set up the remote via the following command:
git annex initremote xxx-s3 type=S3 encryption=shared embedcreds=yes datacenter=EU bucket=xxx-git-annex fileprefix=test/
The remote gets set up correctly and creates the directory I want, and adds a annex-uuid file.
Now when I try to copy a file to the xxx-s3 remote, I get the following error:
$ git annex add ssl-success-and-failure-with-tl-logs.log
add ssl-success-and-failure-with-tl-logs.log ok
(Recording state in git...)
$ git annex copy ssl-success-and-failure-with-tl-logs.log --to xxx-s3
copy ssl-success-and-failure-with-tl-logs.log (gpg) gpg: no valid OpenPGP data found.
gpg: decrypt_message failed: eof
git-annex: user error (gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--batch","--passphrase-fd","10","--decrypt"] exited 2)
failed
git-annex: copy: 1 failed
Any ideas what might be wrong? Is shared cipher broken somehow?

8
doc/forum/shared_cipher_for_S3_attempting_to_decrypt_a_non-encrypted_file/comment_1_b42ff37be172ba841980c17ad6223e06._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmAINLSovhWM_4_KrbngOcxduIbBuKv8ZA"
nickname="Nuutti"
subject="comment 1"
date="2014-08-01T09:28:21Z"
content="""
Sorry, this should probably be in bugs.
"""]]

2
doc/tips/metadata_driven_views.mdwn
View file

@ -6,7 +6,7 @@ keeps track of.
One nice way to use the metadata is through **views**. You can ask
git-annex to create a view of files in the currently checked out branch
that have certian metadata. Once you're in a view, you can move and copy
that have certain metadata. Once you're in a view, you can move and copy
files to adjust their metadata further. Rather than the traditional
hierarchical directory structure, views are dynamic; you can easily
refine or reorder a view.

21
doc/todo/Speed_up___39__import_--clean-duplicates__39__/comment_2_9c6688901ef20badd834419202627d5c._comment Normal file
View file

@ -0,0 +1,21 @@
[[!comment format=mdwn
username="Xyem"
ip="81.111.193.130"
subject="comment 2"
date="2014-08-01T09:05:45Z"
content="""
Could be tested out with an additional flag `--with-size-bloom` on import?
It would then build a bloom (and use a cached one with --fast) and do the usual import.
So I could do this:
# Bloom is created and the import is done using it
git annex import --clean-duplicates --with-size-bloom $TARGET
# Previously created bloom is used
git annex import --clean-duplicates --with-size-bloom --fast $TARGET2
git annex import --clean-duplicates --with-size-bloom --fast $TARGET3
I can implement this behaviour in Perl with Bloom::Filter and let you know how it performs if that would be useful to you..?
"""]]

7
doc/todo/wishlist:_Parity_files_for_encrypted_remotes.mdwn Normal file
View file

@ -0,0 +1,7 @@
I have data that has accompanying parity files. This is supposed to add some
security to file integrity; however, it only works as long as the files are
available unencrypted. In case of encrypted special remotes the existing parity files
won't be of any use if the encrypted versions of files get corrupted in the remote location.
Would it be worthwhile for git-annex to generate its own
parity files for the encrypted data in encrypted special remotes?