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

4 files changed, 45 insertions, 0 deletions

diff --git a/doc/bugs/Weird_directories_appearing/comment_8_b39be0251e96099142b659f3c8340293._comment b/doc/bugs/Weird_directories_appearing/comment_8_b39be0251e96099142b659f3c8340293._comment
new file mode 100644
index 000000000..69a78cfca
--- /dev/null
+++ b/doc/bugs/Weird_directories_appearing/comment_8_b39be0251e96099142b659f3c8340293._comment
@@ -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?
+"""]]
diff --git a/doc/bugs/Weird_directories_appearing/comment_9_431c62c81573468ccf99eeed6ecc2bfd._comment b/doc/bugs/Weird_directories_appearing/comment_9_431c62c81573468ccf99eeed6ecc2bfd._comment
new file mode 100644
index 000000000..a6aaf9517
--- /dev/null
+++ b/doc/bugs/Weird_directories_appearing/comment_9_431c62c81573468ccf99eeed6ecc2bfd._comment
@@ -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.
+"""]]
diff --git a/doc/bugs/index_file_smaller_than_expected/comment_1_d87ae8c4d384d2ce6d1286b51bfdeba1._comment b/doc/bugs/index_file_smaller_than_expected/comment_1_d87ae8c4d384d2ce6d1286b51bfdeba1._comment
new file mode 100644
index 000000000..9cf0ce336
--- /dev/null
+++ b/doc/bugs/index_file_smaller_than_expected/comment_1_d87ae8c4d384d2ce6d1286b51bfdeba1._comment
@@ -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.
+"""]]
diff --git a/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer/comment_2_bd3383c142bf93d9cd496cb668d7782c._comment b/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer/comment_2_bd3383c142bf93d9cd496cb668d7782c._comment
new file mode 100644
index 000000000..719b66eb7
--- /dev/null
+++ b/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer/comment_2_bd3383c142bf93d9cd496cb668d7782c._comment
@@ -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.
+"""]]