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

This commit is contained in:
Joey Hess 2012-09-13 19:28:57 -04:00
commit ac67b4ed00
2 changed files with 25 additions and 1 deletions

View file

@ -0,0 +1,24 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.8.30"
subject="comment 1"
date="2012-09-13T22:00:53Z"
content="""
You can work around the ControlPath too long by running in your git repo:
git config annex.sshcaching false
While I could reproduce that part of your problem, I did *not* see any data actually be transferred when the ControlPath was too long. For example:
<pre>
joey@gnu:~/tmp/t/1>git annex transferkey --to foo SHA256E-s29--66ffceb8b7a1af9c2eb896f26fb8f3bdab0a606da59a7a2d71ae4f7d78ad13c4/SHA256E-s29--66ffceb8b7a1af9c2eb896f26fb8f3bdab0a606da59a7a2d71ae4f7d78ad13c4
ControlPath too long
rsync: connection unexpectedly closed (0 bytes received so far) [sender]
rsync error: error in rsync protocol data stream (code 12) at io.c(605) [sender=3.0.9]
rsync failed -- run git annex again to resume file transfer
failed
git-annex: transferkey: 1 failed
</pre>
"""]]

View file

@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant?
[[!poll open=yes 4 "Amazon S3" 5 "Box.com" 11 "My phone (or MP3 player)" 0 "Tahoe-LAFS" 1 "OpenStack SWIFT" 1 "Google Drive" 1 "Amazon Glacier"]]
[[!poll open=yes 5 "Amazon S3" 5 "Box.com" 15 "My phone (or MP3 player)" 0 "Tahoe-LAFS" 1 "OpenStack SWIFT" 1 "Google Drive" 2 "Amazon Glacier"]]
This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they