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

This commit is contained in:
Joey Hess 2013-07-20 19:42:29 -04:00
commit 7979526043
12 changed files with 144 additions and 0 deletions

View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.140"
subject="comment 6"
date="2013-07-20T22:31:02Z"
content="""
Isolated the bug to a problem with the upstream inotify library.
<https://github.com/kolmodin/hinotify/issues/5> I've sent in a patch to that library that fixes the problem.
Unfortunately, I cannot work around it in git-annex more than I already have. It'll no longer crash, but will skip over files or directories that contain characters not valid in the current locale.
I have applied my patch to the haskell-hinotify package in Debian unstable, and have deployed fixed versions to all my linux autobuilds, including Android. (An Android user had mentioned also seeing this bug.)
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="andy"
ip="108.202.17.204"
subject="comment 5"
date="2013-07-20T21:34:08Z"
content="""
Yes, the symlink was still broken. Or rather, `tar -tf filename.tar` didn't like the file.
The file's about 193 M bzipped. I'll be e-mailing you a link to an S3 copy with DojOsEf2 in the subject line of the email--once the upload finishes. :)
I'm not sure if this is relevant, but the file is a tar of an annex and another git repo. Perhaps that is influencing something (although I presume it shouldn't)?
"""]]

View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.140"
subject="comment 6"
date="2013-07-20T22:43:27Z"
content="""
Got the file. Verified checksum.
Reproduced bug!
Wow, it really seems to be a bug specific to this one particular
file content. That's crazy.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.140"
subject="comment 7"
date="2013-07-20T23:00:59Z"
content="""
Can be reproduced with first 500kb of file. I have deleted all the rest of the file, without looking at it. (Scout's honor!)
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.140"
subject="comment 8"
date="2013-07-20T23:07:17Z"
content="""
Ok, it is in fact relevant that the file is a tarball of a git-annex repository, because git-annex add turns out to be looking at the beginning of the file, and seeing that it contains a git-annex link.
I thought that code was only supposed to fire in repos on FAT filesystems that don't have symlinks. So, several issues to fix here, it seems..
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.140"
subject="comment 9"
date="2013-07-20T23:26:09Z"
content="""
Ok, I've put in 2 separate bug fixes, any one of which would have been sufficient to prevent this data loss. Am working on a third fix to detect this kind of problem at a higher level and avoid losing content even if it gets all confused.
This bug may be a candidate to be backported to Debian stable, since it causes data loss.
"""]]

View file

@ -0,0 +1,21 @@
### Please describe the problem.
I am unable to restore a git-annex dir to its pre init state.
### What steps will reproduce the problem?
init a git-annex dir on android with a file system with out symlinks.
use for a while.
Run: "git-annex uninit" -> You cannot run this command in a direct mode repository.
Run: "git-annex indirect" -> Git is configured to not use symlinks, so you must use direct mode.
### What version of git-annex are you using? On what operating system?
git-annex version: 4.20130601-g7483ca4
### Please provide any additional information below.
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
# End of transcript or log.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.140"
subject="comment 1"
date="2013-07-20T23:20:48Z"
content="""
There's no way to make indirect mode work on a filesystem w/o symlinks, but it should be possible to make unannex (required for uninit) work in direct mode. Just has not been done yet.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawm_cen0223TLcWCTPwCPecCQC5JxGnPO04"
nickname="Eric"
subject="comment 2"
date="2013-07-20T23:26:23Z"
content="""
unannex an uninit are the main thing, so that people have an exit strategy for git-annex on android.
"""]]