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

This commit is contained in:
Joey Hess 2014-01-14 17:23:27 -04:00
commit 9ea52b03c6
4 changed files with 45 additions and 0 deletions

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnsuhFUIfWNT-Q-C02FDaSQqceFDge5M9w"
nickname="Florian"
subject="comment 8"
date="2014-01-14T21:15:51Z"
content="""
Wow, thanks a lot! The fix will be included in the next release of the tarballs?
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.43"
subject="comment 9"
date="2014-01-14T21:17:16Z"
content="""
It will be included in the next build of the daily built tarballs. Within an hour of now.
"""]]

View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.43"
subject="comment 1"
date="2014-01-14T21:12:19Z"
content="""
It's unusual for git's index file to get corrupted or short like this. git writes to .git/index by first writing the new content to .git/index.lock, and then once it's written, renaming it. So if git is interrupted in the middle of a write, it doesn't leave the index file truncated. Of course, it's somewhat up to the OS's filesystem and buffering, and so I suppose if the system loses power at just the right time, and the filesystem does not journal data, this could happen.
Anyway, git-annex's assistant should be able to detect when the index file is corrupt, including too short, and fix it. When I try with a current version of git-annex, opening the webapp or starting the assistant results in the index file being automatically repaired, with this logged to .git/annex/daemon.log:
<pre>
fatal: index file smaller than expected
[2014-01-14 16:58:11 JEST] SanityCheckerStartup: corrupt index file found at startup; removing and restaging
</pre>
However, it looks like it needs to do the same check for .git/annex/index. I was able to reproduce this bug by corrupting that file.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.43"
subject="comment 2"
date="2014-01-14T21:16:14Z"
content="""
I tried using git-annex on encfs to see if I could reproduce this problem, and I could not get exactly this error, but I certianly did see it cause problems with the ssh connection caching socket.
It would be a good idea to `git config annex.sshcaching false` in repositories stored on encfs.
Actually, given other reports of problems caused by encfs, it would be a good idea to not use git-annex on encfs. There are better ways to encrypt your files.
"""]]