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

This commit is contained in:
Joey Hess 2012-09-21 19:44:12 -04:00
commit a8e1b3ad42
6 changed files with 58 additions and 1 deletions

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 14 "Amazon S3" 5 "Box.com" 43 "My phone (or MP3 player)" 4 "Tahoe-LAFS" 3 "OpenStack SWIFT" 11 "Google Drive" 7 "Amazon Glacier"]]
[[!poll open=yes 14 "Amazon S3" 5 "Box.com" 43 "My phone (or MP3 player)" 4 "Tahoe-LAFS" 3 "OpenStack SWIFT" 11 "Google Drive" 8 "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

View file

@ -0,0 +1,22 @@
Whenever I try to get a file with a non-English character, git annex gives me trouble that I don't have with English filenames from the same repo. I'm hesitant to file a bug report here since the problem seems to stem from rsync not being able to handle the characters. Here's the output (everything enclosed in pointy brackets are redacted):
get <artist>/<album>/<track> (from origin...)
git-annex: /home/<username>/Music/.git/annex/transfer/upload/53e11324-041f-11e2-93ca-27250d76416f/SHA256-s7941079--c5a31f15302d57563d8cd35e43ba34669b5485a99b617a83c89fba02fb2ca981: commitBuffer: invalid argument (invalid character)
protocol version mismatch -- is your shell clean?
(see the rsync man page for an explanation)
rsync error: protocol incompatibility (code 2) at compat.c(174) [Receiver=3.0.9]
git-annex-shell: sendkey: 1 failed
rsync failed -- run git annex again to resume file transfer
Unable to access these remotes: origin
Try making some of these repositories available:
604f093f-a980-4740-a9df-d21b580a2ba4 -- origin (<remote>)
failed
It spits out similar errors for all files with Japanese/German/French/special characters, and ends with this on the last line:
git-annex: get: 138 failed

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="sauluskahn"
ip="67.171.218.222"
subject="comment 1"
date="2012-09-21T21:40:30Z"
content="""
Also, git annex is 3.20120825 on both machines, and rsync is 3.0.9
Both have no problem handling the characters on their own, but when I try to rsync them I get trouble.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.14.141"
subject="comment 2"
date="2012-09-21T23:23:04Z"
content="""
git-annex 3.20120825 is not an actual release, just some version number used in git head.
This bug, TTBOMK, was introduced in version 3.20120721, and fixed by git commit 0b12db64d834979d49ed378235b0c19b34e4a4d6 last Sunday.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.14.141"
subject="comment 3"
date="2012-09-21T23:23:52Z"
content="""
I take that back about 3.20120825, it was so a real release! :) Anyway, bug is fixed in git head, and there will be a release along soon with it.
"""]]

View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="basak"
subject="comment 2"
date="2012-09-21T22:21:04Z"
content="""
I've created a glacier command line interface that integrates with git-annex [here](https://github.com/basak/glacier-cli), currently using the hook special remote mechanism. To get around the time delay, operations which require a job submission will submit the job and then fail. Retrying again four hours later should then succeed. It seems to work pretty well with git-annex.
"""]]