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

4 files changed, 72 insertions, 0 deletions

diff --git a/doc/bugs/Symlinks_from_git-annex_repository_to_outside_git_repository_not_supported/comment_1_06ac38f32039ad43b0c2623c8fdb1df6._comment b/doc/bugs/Symlinks_from_git-annex_repository_to_outside_git_repository_not_supported/comment_1_06ac38f32039ad43b0c2623c8fdb1df6._comment
new file mode 100644
index 000000000..01685d804
--- /dev/null
+++ b/doc/bugs/Symlinks_from_git-annex_repository_to_outside_git_repository_not_supported/comment_1_06ac38f32039ad43b0c2623c8fdb1df6._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8"
+ nickname="Maarten"
+ subject="workaround?"
+ date="2013-12-05T14:17:57Z"
+ content="""
+Until this is fixed, how can I manually remove a file from git annex syncing?
+"""]]
diff --git a/doc/bugs/annex_seems_to_ignore_core.bare_setting.mdwn b/doc/bugs/annex_seems_to_ignore_core.bare_setting.mdwn
new file mode 100644
index 000000000..e54b9cbe3
--- /dev/null
+++ b/doc/bugs/annex_seems_to_ignore_core.bare_setting.mdwn
@@ -0,0 +1,41 @@
+### Please describe the problem.
+I have a transfer repository on a thumbdrive with a FAT file system mounted. It has been working very well for almost a year.
+However, the current annex version overrides the core.bare setting with 'false' and tries to checkout the work tree on my thumbdrive (e.g. on a 'git annex status').
+
+### What version of git-annex are you using? On what operating system?
+
+Broken git-annex versions:
+
+ * 5.20131130-gc25be33
+ * 5.20131118-gc7e5cde
+
+Working version:
+
+ * 4.20131101-gf59a6d1
+
+OS is Linux.
+
+### Please provide any additional information below.
+
+[[!format sh """
+$> git config --list
+core.repositoryformatversion=0
+core.filemode=false
+core.bare=true
+core.symlinks=false
+core.ignorecase=true
+annex.uuid=3fb63b01-40cf-4613-b171-d6cba04028af
+annex.version=4
+annex.crippledfilesystem=true
+annex.direct=true
+"""]]
+
+[[!format sh """
+$> git annex status -d
+[2013-12-05 15:01:30 CET] read: git ["--git-dir=/media/transfer/annex-media.git","--work-tree=/media/transfer","-c","core.bare=false","symbolic-ref","HEAD"]
+[2013-12-05 15:01:30 CET] read: git ["--git-dir=/media/transfer/annex-media.git","--work-tree=/media/transfer","-c","core.bare=false","show-ref","--hash","refs/heads/master"]
+[2013-12-05 15:01:30 CET] call: git ["--git-dir=/media/transfer/annex-media.git","--work-tree=/media/transfer","-c","core.bare=false","update-ref","refs/heads/annex/direct/master","eb688442ea29660e9bc604434a77821b9c0349ad"]
+[2013-12-05 15:01:30 CET] call: git ["--git-dir=/media/transfer/annex-media.git","--work-tree=/media/transfer","-c","core.bare=false","checkout","-q","-B","annex/direct/master"]
+...
+git-annex: git [Param "checkout",Param "-q",Param "-B",Param "annex/direct/master"] failed
+"""]]
diff --git a/doc/design/assistant/gpgkeys/comment_1_a14427f88c9fd8e25ad8708146bb4bff._comment b/doc/design/assistant/gpgkeys/comment_1_a14427f88c9fd8e25ad8708146bb4bff._comment
new file mode 100644
index 000000000..610f9bbb6
--- /dev/null
+++ b/doc/design/assistant/gpgkeys/comment_1_a14427f88c9fd8e25ad8708146bb4bff._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="gernot"
+ ip="85.197.15.125"
+ subject="Paperkey"
+ date="2013-12-05T11:37:02Z"
+ content="""
+Regarding backups, have you considered using [paperkey](http://www.jabberwocky.com/software/paperkey/) (also [in Debian](http://packages.debian.org/search?keywords=paperkey))?
+It only stores a minimal amount of key data and formats it in a human-readable way.
+
+The result is mainly meant to be printed but `paperkey` would probably also be a good way to keep the size of QR codes down.
+
+I've actually recovered a key from a such a printed backup (using OCR) and it worked great thanks to line-wise checksums.
+Maybe you could create paperkey PDF files with a proper OCR font through the web app?
+
+"""]]
diff --git a/doc/forum/Can_Not_Sync_to_Git_Repo/comment_4_a947736911e68856f2c3494963063df8._comment b/doc/forum/Can_Not_Sync_to_Git_Repo/comment_4_a947736911e68856f2c3494963063df8._comment
new file mode 100644
index 000000000..c2a48b557
--- /dev/null
+++ b/doc/forum/Can_Not_Sync_to_Git_Repo/comment_4_a947736911e68856f2c3494963063df8._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmu416zAYgYzbXVZAe30MiXoOWO4z6nGX8"
+ nickname="Johannes"
+ subject="comment 4"
+ date="2013-12-05T16:31:04Z"
+ content="""
+I have the same problem. \"git annex repair\" does not detect any problems.
+"""]]