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

4 files changed, 63 insertions, 0 deletions

diff --git a/doc/bugs/__39__git_annex_get__39___fails_for_unlocked_files_with_special_characters___40__e.g._umlauts__41___when_using_precompiled_version_6.20160126-g2336107_/comment_3_205784e6385bc8cdd21af4773c57a6f3._comment b/doc/bugs/__39__git_annex_get__39___fails_for_unlocked_files_with_special_characters___40__e.g._umlauts__41___when_using_precompiled_version_6.20160126-g2336107_/comment_3_205784e6385bc8cdd21af4773c57a6f3._comment
new file mode 100644
index 000000000..c78cce50e
--- /dev/null
+++ b/doc/bugs/__39__git_annex_get__39___fails_for_unlocked_files_with_special_characters___40__e.g._umlauts__41___when_using_precompiled_version_6.20160126-g2336107_/comment_3_205784e6385bc8cdd21af4773c57a6f3._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="christoph.schober@b8a66d38d9dfeeb6d7cd83888079d5870014ad7a"
+ nickname="christoph.schober"
+ subject="comment 3"
+ date="2016-02-18T21:47:39Z"
+ content="""
+Perfect, thank you!
+"""]]
diff --git a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_4_8688477bb694dbc9e6c7768f5f375f3f._comment b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_4_8688477bb694dbc9e6c7768f5f375f3f._comment
new file mode 100644
index 000000000..1fa409f9c
--- /dev/null
+++ b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_4_8688477bb694dbc9e6c7768f5f375f3f._comment
@@ -0,0 +1,28 @@
+[[!comment format=mdwn
+ username="emanuele.olivetti@47d88ed185b03191e25329caa6fabc2efb3118b2"
+ nickname="emanuele.olivetti"
+ subject="repository marked as dead (!)"
+ date="2016-02-18T14:33:56Z"
+ content="""
+Update: I've just tried to add a 'test' directory to the repository with only a 'foo' file inside, then git commit. Surprisingly, if I do 'git annex fsck .' of it, the repository is marked as **dead** and no known copies of foo are available:
+
+    (master)> mkdir test ; cd test
+    test (master) > cat > foo
+    bar
+    test (master)> git annex add .
+    add foo ok
+    (recording state in git...)
+    test (master)> git commit -m \"added fake content to test git annex repo\"
+    [master b9f0a8f] added fake content to test git annex repo
+     1 file changed, 1 insertion(+)
+     create mode 120000 events/2015/test/foo
+    test (master)> git annex fsck .
+    Warning: Fscking a repository that is currently marked as dead.
+    fsck foo (checksum...) 
+      ** No known copies exist of foo
+    failed
+    (recording state in git...)
+    git-annex: fsck: 1 failed
+
+At this point, I suspect that the repository on my laptop has some serious problem. Shall I move this discussion to the forum? It may be a git-annex bug but it can just be that the repository is damaged for other reasons. Moreover, what is the best course of action, at this point?
+"""]]
diff --git a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_5_a256583bd9b3815a23cd1ca40d6c19ca._comment b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_5_a256583bd9b3815a23cd1ca40d6c19ca._comment
new file mode 100644
index 000000000..785d6c7b7
--- /dev/null
+++ b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_5_a256583bd9b3815a23cd1ca40d6c19ca._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="emanuele.olivetti@47d88ed185b03191e25329caa6fabc2efb3118b2"
+ nickname="emanuele.olivetti"
+ subject="'git-annex semitrust' seems to solve the issue"
+ date="2016-02-18T21:51:00Z"
+ content="""
+Given that the repository is marked as dead, I tried to bring it back with 'git-annex semitrust laptop' - 'laptop' being the name of the git annex repository on my laptop. Apparently, this action solved the problem. Fsck now works as expected, and I could sync and get the new files on the clone on the external hard disk as usual.
+
+Now, if this the correct solution to my problem, I am wondering how it is possible that the repository was marked as dead. I carefully checked the history of previous command, but no sign of 'git annex dead' o similar. Are there scenarios where a repository is automatically marked as dead?
+"""]]
diff --git a/doc/devblog/day_360__annex.largefiles_mimetype/comment_3_3145e5843e20a037351e5a14fa3d6e9a._comment b/doc/devblog/day_360__annex.largefiles_mimetype/comment_3_3145e5843e20a037351e5a14fa3d6e9a._comment
new file mode 100644
index 000000000..659f02f94
--- /dev/null
+++ b/doc/devblog/day_360__annex.largefiles_mimetype/comment_3_3145e5843e20a037351e5a14fa3d6e9a._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="davho"
+ subject="Why would it fail?"
+ date="2016-02-19T15:49:00Z"
+ content="""
+Yeah! I've waited for this option for a half a year :-)  Thumbs up for finally including it!
+
+Doesn't work out of the box, though; I do have the MagicMime build flag but it fails to add files now!
+
+I get this error message for every file I try to add:
+
+    /etc/magic, 0: Warning: using regular magic file `/usr/share/misc/magic'
+    
+    git-annex: user error (magicLoadDefault: could not find any valid magic files!)
+    failed
+
+"""]]