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

This commit is contained in:
Joey Hess 2012-06-20 12:57:19 -04:00
commit 701231e930
6 changed files with 76 additions and 0 deletions

View file

@ -0,0 +1,14 @@
What steps will reproduce the problem?
I don't know exactly when it started
What is the expected output? What do you see instead?
When I run git annex unused I get
unused . (checking for unused data...) (checking master...) git-annex: Cannot decode byte '\xb4': Data.Text.Encoding.decodeUtf8: Invalid UTF-8 stream
Most likely I have added some file with a strange encoding that git-annex can't decode. The problem is that the unused process aborts because of this.
What version of git-annex are you using? On what operating system?
3.20120522, Debian testing
Please provide any additional information below.

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.2.6"
subject="comment 1"
date="2012-06-20T14:30:27Z"
content="""
Try running `git annex unused --debug`; this will tell us the git command that's outputing the data it cannot process. Then you can try running that git command and see what the problem filename is.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.2.6"
subject="comment 2"
date="2012-06-20T14:34:23Z"
content="""
Your `locale` setting may also be relevant. FWIW, I've tried to create a file with `\xb4` in its name and have not gotten git-annex unused to crash on it.
"""]]

View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnXgp-iIaBK5pnk22xqMVERQb97VyXaejs"
nickname="Kristian"
subject="comment 3"
date="2012-06-20T14:37:09Z"
content="""
This is what happens when I add the debug parameter
git annex unused --debug
unused . (checking for unused data...) git [\"--git-dir=/home/kristian/AnnexMedia/.git\",\"--work-tree=/home/kristian/AnnexMedia\",\"ls-files\",\"--cached\",\"-z\",\"--\",\"/home/kristian/AnnexMedia\"]
git [\"--git-dir=/home/kristian/AnnexMedia/.git\",\"--work-tree=/home/kristian/AnnexMedia\",\"show-ref\"]
(checking master...) git [\"--git-dir=/home/kristian/AnnexMedia/.git\",\"--work-tree=/home/kristian/AnnexMedia\",\"ls-tree\",\"--full-tree\",\"-z\",\"-r\",\"--\",\"refs/heads/master\"]
git [\"--git-dir=/home/kristian/AnnexMedia/.git\",\"--work-tree=/home/kristian/AnnexMedia\",\"cat-file\",\"--batch\"]
git-annex: Cannot decode byte '\xb4': Data.Text.Encoding.decodeUtf8: Invalid UTF-8 stream
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.2.6"
subject="comment 4"
date="2012-06-20T14:49:09Z"
content="""
Ah, reproduced it; need to use the WORM backend and have the file present in another branch..
"""]]

View file

@ -0,0 +1,19 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnXgp-iIaBK5pnk22xqMVERQb97VyXaejs"
nickname="Kristian"
subject="comment 5"
date="2012-06-20T14:55:33Z"
content="""
I checkout out the git annex branch and using
find * | grep -P \"[\xb4]\"
I found a file
43e/b16/WORM-s4118528-m1245167306--Jerry Lee Lewis - Whole Lotta Shakin\302\264 Going\302\264 On.mp3.log
The corresponding file also existed in the master branch (as a link).
I moved both these files to a folder outside my repository and synched my git-annex branch with by master server. I still get the same error. Is there any other place where information about this file is stored?
"""]]