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

16 files changed, 432 insertions, 0 deletions

diff --git a/doc/bugs/Android__58___Cannot_create_repo_on_external_sd_card.mdwn b/doc/bugs/Android__58___Cannot_create_repo_on_external_sd_card.mdwn
new file mode 100644
index 000000000..7043970d2
--- /dev/null
+++ b/doc/bugs/Android__58___Cannot_create_repo_on_external_sd_card.mdwn
@@ -0,0 +1,62 @@
+I am using the latest daily build for Android 5.0
+
+My version is Android 5.0.1 Lollipop. And I'm using a Samsung Galaxy S4 unrooted.
+
+Trying to create a repositpory in the folder /storage/extSdCard/Music gives me a webpage with a red error badge that says:
+
+    "Internal Server Error"
+    
+    git init failed
+
+    Output:
+    /storage/extSdCard/Music/.git: Permission denied
+
+I'm pretty sure this is because of Android's crappy permission system on sd cards. But when I install the app, it tells me it is asking for
+read write access to the sd card. So this consideration must have happened.
+
+
+
+### Please describe the problem.
+
+I am using the latest daily build for Android 5.0
+
+My version is Android 5.0.1 Lollipop. And I'm using a Samsung Galaxy S4 unrooted.
+
+Trying to create a repositpory in the folder /storage/extSdCard/Music gives me a webpage with a red error badge that says:
+
+    "Internal Server Error"
+    
+    git init failed
+
+    Output:
+    /storage/extSdCard/Music/.git: Permission denied
+
+I'm pretty sure this is because of Android's crappy permission system on sd cards. But when I install the app, it tells me it is asking for
+read write access to the sd card. So this consideration must have happened.
+
+### What steps will reproduce the problem?
+
+1. Install the Android 5.0 daily build on an Android 5.0.1 phone.
+2. Try to create a repo on an external sd card.
+
+### What version of git-annex are you using? On what operating system?
+
+Latest daily build of Android 5.0 git annex on Android 5.0.1
+
+### Please provide any additional information below.
+
+When I run adb shell I see the following permissions on the file in question:
+
+    drwxrwx--- root     sdcard_r          2016-04-02 14:11 Music
+
+Additional info. The terminal emulator shows this output:
+
+    Falling back to hardcoded app location: cannot find expected files in /data/app/ga.androidterm-2/lib
+    git annex webapp
+    WARNING: linker: git-annex has text relocations. This is wasting memory and prevents security hardening. Please fix.
+
+I have tried moving the app to the sd card, but it will not work if I do that.
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+Yes! It's by far one of my favorite apps! it works very well on my laptop, on my home file server, and on my internal storage on my Android phone :)
diff --git a/doc/bugs/Assistant_will_annex_your_files_on_startup_if_you_create_a_repository_in___126____47__.mdwn b/doc/bugs/Assistant_will_annex_your_files_on_startup_if_you_create_a_repository_in___126____47__.mdwn
new file mode 100644
index 000000000..e2d67c68c
--- /dev/null
+++ b/doc/bugs/Assistant_will_annex_your_files_on_startup_if_you_create_a_repository_in___126____47__.mdwn
@@ -0,0 +1,23 @@
+### Please describe the problem.
+
+If I create a git annex repository in my home directory, then start the assistant, the assistant will try to annex my entire home dir.
+
+### What steps will reproduce the problem?
+
+$ cd
+$ git init
+$ git annex init
+
+Applications Menu -> Internet -> Git Annex
+
+### What version of git-annex are you using? On what operating system?
+
+Debian Jessie git-annex (5.20141125)
+
+### Expected behavior
+
+The assistant shouldn't do anything unless I tell it to. Currently, I cannot play with the assistant at all, because I do not want everything in my homedir to be locked and symlinked.
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+I use git annex for managing the image and video resources on my website and it works fine for that.
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_19_02fdc2292389cec04a60a1027b43a088._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_19_02fdc2292389cec04a60a1027b43a088._comment
new file mode 100644
index 000000000..6f09d12a7
--- /dev/null
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_19_02fdc2292389cec04a60a1027b43a088._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991"
+ nickname="timothyhobbs"
+ subject="comment 19"
+ date="2016-04-03T22:30:59Z"
+ content="""
+I think that you have underestimated the severity of this problem, as well as failed to see that this is a problem mostly specific to git annex. For tracking changes to code, this usecase does not make much sense. But when using git annex as an advanced CAS filesystem, this limitation is absolutely fatal. I would like to use git annex as a de-duplicating CAS filesystem in order to optimize file transfers across computers and in order to preform de-duplication. Git annex is great for this use case, except for this one fatal flaw. If it is impossible for a \".git\" directory to exist within the git-annex CAS filesystem, then this filesystem is no longer capable of storing arbitrary content. It is impossible, for me to use git annex in a way that is similar to [OSTree](https://wiki.gnome.org/action/show/Projects/OSTree?action=show&redirect=OSTree) for example.
+
+Furthermore, you are wrong when you claim that using git annex to sychronize git repositories is silly. It is no more silly than using git annex to synchronize mercurial or subversion repositories. \"It could cause corruption!\" you say. But if git annex causes corruption, then it cannot be used for synchronization period, and that has nothing to do with git.
+
+I think that this limitation has been one of the few reasons why git annex has not been widely adopted for file synchronization.
+
+I know that you may not be motivated to solve this problem, but I am. As the author of [subuser](subuser.org) I would really like to be able to use git annex as a CAS filesystem similar to OSTree. I am highly motivated to solve this problem, but I do not yet know how. What would be acceptable to you if I were to make a pull request? Would an acceptable solution be to store a list of git repositories in .git/annex/folders-named.git that would map out where the .git folders were supposted to go, and then add those folders to the git by changing their names? AKA, git annex would add a folder named /foo/bar/.annexed-git-ab343ax/ instead of /foo/bar/.git/ and then it would add the line \"/foo/bar/.annexed-git-ab343ax/\" to \".git/annex/folders-named.git\". On checkout git annex could then rename /foo/bar/.annexed-git-ab343ax/ to /foo/bar/.git/ and all would be fine wouldn't it? Do you have any other ideas? Would you accept such a pull request?
+"""]]
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_20_85dcbf16407c15d4869288c951214aef._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_20_85dcbf16407c15d4869288c951214aef._comment
new file mode 100644
index 000000000..d501298e1
--- /dev/null
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_20_85dcbf16407c15d4869288c951214aef._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991"
+ nickname="timothyhobbs"
+ subject="comment 20"
+ date="2016-04-03T23:00:48Z"
+ content="""
+It occures to me, that git also cannot store empty folders, which would be a second hurdle when wanting to annex arbitrary file trees. It seems that a similar solution would be at hand, to store paths to empty folders in \".git/annex/empty-folders\". 
+"""]]
diff --git a/doc/bugs/Windows__58___git_annex_get_failed.mdwn b/doc/bugs/Windows__58___git_annex_get_failed.mdwn
new file mode 100644
index 000000000..78b964de3
--- /dev/null
+++ b/doc/bugs/Windows__58___git_annex_get_failed.mdwn
@@ -0,0 +1,88 @@
+### Please describe the problem.
+I'm using git-annex v6 in windows and seems `git annex get` fails.
+Deleting the pointer files and doing a hard reset seems to fix the problem.
+Another bug report named "v6 repo can not restore files with executable permission" seems to point to the same problem but a little different.
+
+### What steps will reproduce the problem?
+I have a repo in D:\annex with a file `test`
+Now I create another repo:
+
+	$ cd H:\annex
+
+	$ git init
+	Initialized empty Git repository in H:/annex/.git/
+
+	$ git annex init "portable drive"
+	init portable drive
+	  Detected a filesystem without fifo support.
+
+	  Disabling ssh connection caching.
+
+	  Detected a crippled filesystem.
+
+	  Enabling direct mode.
+	ok
+	(recording state in git...)
+
+	$ git annex upgrade
+	upgrade . (v5 to v6...)
+	  Upgraded repository out of direct mode.
+
+	  Changes have been staged for all annexed files in this repository; you should run `git commit` to commit these changes.
+
+	  Any other clones of this repository that use direct mode need to be upgraded now, too.
+	ok
+
+	$ git remote add laptop D:/annex
+
+	$ git annex sync
+	commit  ok
+	pull laptop
+	warning: no common commits
+	remote: Counting objects: 21, done.
+	remote: Compressing objects: 100% (15/15), done.
+	remote: Total 21 (delta 3), reused 0 (delta 0)
+	Unpacking objects: 100% (21/21), done.
+	From D:/annex
+	 * [new branch]      git-annex  -> laptop/git-annex
+	 * [new branch]      master     -> laptop/master
+	 * [new branch]      synced/git-annex -> laptop/synced/git-annex
+	 * [new branch]      synced/master -> laptop/synced/master
+
+
+	Already up-to-date.
+	ok
+	(merging laptop/git-annex laptop/synced/git-annex into git-annex...)
+	(recording state in git...)
+	push laptop
+	Counting objects: 8, done.
+	Delta compression using up to 8 threads.
+	Compressing objects: 100% (6/6), done.
+	Writing objects: 100% (8/8), 928 bytes | 0 bytes/s, done.
+	Total 8 (delta 0), reused 0 (delta 0)
+	To D:/annex
+	   c1aee82..980dc01  git-annex -> synced/git-annex
+	ok
+
+	$ git annex get .
+	get test (from laptop...)
+	SHA256E-s14488367--4391729b982439764813156e1bfc12e9626ae89452ab812f5180c376fbd57fc0
+		 14,488,367 100%   63.24MB/s    0:00:00 (xfr#1, to-chk=0/1)
+	(checksum...)
+	git-annex: DeleteFile ".\\test": permission denied (The process cannot access the file because it is being used by another process.)
+	failed
+	git-annex: get: 1 failed
+
+It seems to try to delete the pointer file, but finds the file in use. Maybe fsck is using it?
+
+	$ cat test
+	/annex/objects/SHA256E-s14488367--4391729b982439764813156e1bfc12e9626ae89452ab812f5180c376fbd57fc0
+
+	$ git annex lock
+	lock test git-annex: content not present; cannot lock
+
+And `git annex unlock` will do nothing.
+
+If you can't reproduce the problem, I'll run the tests for you.
+### What version of git-annex are you using? On what operating system?
+Latest compile from source, Windows 8.1
diff --git a/doc/bugs/Windows__58___git_annex_get_failed/comment_3_22809831226478bac7f9361ad8d0c79d._comment b/doc/bugs/Windows__58___git_annex_get_failed/comment_3_22809831226478bac7f9361ad8d0c79d._comment
new file mode 100644
index 000000000..7ca9875f1
--- /dev/null
+++ b/doc/bugs/Windows__58___git_annex_get_failed/comment_3_22809831226478bac7f9361ad8d0c79d._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="ExGen"
+ subject="Found?"
+ date="2016-04-03T20:15:01Z"
+ content="""
+I think I found the problem: <br/>
+After I edit the file and commit, if I **lock** the file and **commit again**, the problem won't happen. <br/>
+I thought there shouldn't be a difference between committing a locked file and an unlocked file? <br/><br/>
+There is another problem too: When you unlock the file, git thinks you changed it. Maybe you could fix this too?
+"""]]
diff --git a/doc/bugs/autostart__47__git-annex.desktop_gets_resurrected/comment_2_0378843b9c7281d587304ac9c42d46f5._comment b/doc/bugs/autostart__47__git-annex.desktop_gets_resurrected/comment_2_0378843b9c7281d587304ac9c42d46f5._comment
new file mode 100644
index 000000000..01e468f3f
--- /dev/null
+++ b/doc/bugs/autostart__47__git-annex.desktop_gets_resurrected/comment_2_0378843b9c7281d587304ac9c42d46f5._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991"
+ nickname="timothyhobbs"
+ subject="comment 2"
+ date="2016-04-04T06:07:20Z"
+ content="""
+It would be better to prompt the user \"Would you like to automatically start git annex when you log in? Yes No [ ] Do not display again.\" That way user's won't be surprised that there is disk churn when they startup their computer...
+"""]]
diff --git a/doc/bugs/git-annex-shell__58___bad_parameters_when_trying_to_configure_a_shell_sandbox.mdwn b/doc/bugs/git-annex-shell__58___bad_parameters_when_trying_to_configure_a_shell_sandbox.mdwn
new file mode 100644
index 000000000..1cfbbb714
--- /dev/null
+++ b/doc/bugs/git-annex-shell__58___bad_parameters_when_trying_to_configure_a_shell_sandbox.mdwn
@@ -0,0 +1,127 @@
+### Please describe the problem.
+
+I am trying to make an SSH key restricted to use git-annex and only git-annex, and only readonly on a specific repository (or many repositories, ideally, but let's start with that0>
+
+I am following [[forum/Restricting_git-annex-shell_to_a_specific_repository/]] and searched this wiki for similar problems, but couldn't figure out a solution.
+
+### What steps will reproduce the problem?
+
+1. install git-annex on an android machine (not sure it needs to be on android, but here it is)
+2. create passwordless SSH keys with `ssh-keygen` on the git-annex terminal there
+3. add the public part of that key to `~/.ssh/authorized_keys` on the git-annex server (note: without any command restriction for now)
+4. git clone the repository on the android device
+5. change the `authorized_keys` for this:
+
+    command="git-annex-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding ssh-rsa AAAAB[...]
+
+Expected result: I can operate on the git-annex repository without problem.
+
+Actual result: I get `git-annex-shell: bad parameters` whatever I do.
+
+I have tried variations of the above `authorized_keys` line:
+
+* `command="git-annex-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding ssh-rsa AAAAB[...]`
+* `command="/usr/bin/git-annex-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding ssh-rsa AAAAB[...]`
+* `command="~/.ssh/git-annex-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding ssh-rsa AAAAB[...]`
+
+.. where `~/.ssh/git-annex-shell` is as described in [[forum/Restricting_git-annex-shell_to_a_specific_repository/]]:
+
+[[!format sh """
+#!/bin/sh
+set -e
+
+if [ "x$SSH_ORIGINAL_COMMAND" != "x" ]; then
+exec /usr/bin/git-annex-shell -c "$SSH_ORIGINAL_COMMAND"
+else
+exec /usr/bin/git-annex-shell -c "$@"
+fi
+"""]]
+
+### What version of git-annex are you using? On what operating system?
+
+The "client" side is:
+
+[[!format sh """
+# git annex version
+WARNING: linker: git-annex has text relocations. This is wasting memory and prevents security hardening. Please fix.
+git-annex version: 6.20160317-g204dbf5
+build flags: Assistant Webapp Testsuite S3(multipartupload) WebDAV Inotify XMPP TorrentParser Feeds Quvi
+key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL
+remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+local repository version: 5
+supported repository versions: 5 6
+upgrade supported from repository versions: 0 1 2 4 5
+"""]]
+
+On cyanogenmod 12.1.
+
+The server side is my usual 5.20151208-1~bpo8+1 from backports on Debian jessie.
+
+### Please provide any additional information below.
+
+Example of a failed transfer:
+
+[[!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
+
+# git annex get John\ Coltrane/Coltrane/02.\ John\ Coltrane\ -\ Soul\ eyes.mp3   --debug
+WARNING: linker: git-annex has text relocations. This is wasting memory and prevents security hardening. Please fix.
+[2016-04-04 10:38:18.710817] read: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","-c","core.bare=false","ls-files","--cached","-z","--","John Coltrane/Coltrane/02. John Coltrane - Soul eyes.mp3"]
+get John Coltrane/Coltrane/02. John Coltrane - Soul eyes.mp3 [2016-04-04 10:38:19.067234] read: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","-c","core.bare=false","show-ref","git-annex"]
+[2016-04-04 10:38:19.226703] process done ExitSuccess
+[2016-04-04 10:38:19.24413] read: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","-c","core.bare=false","show-ref","--hash","refs/heads/git-annex"]
+[2016-04-04 10:38:19.291315] process done ExitSuccess
+[2016-04-04 10:38:19.297724] read: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","-c","core.bare=false","log","refs/heads/git-annex..1bb927d3ff7ee7a15623c8798fa20d3ee180d8d6","-n1","--pretty=%H"]
+[2016-04-04 10:38:19.395572] process done ExitSuccess
+[2016-04-04 10:38:19.396091] read: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","-c","core.bare=false","log","refs/heads/git-annex..b7ab5e62053e838f15e38fc8e4e523da9591f89b","-n1","--pretty=%H"]
+[2016-04-04 10:38:19.443764] process done ExitSuccess
+[2016-04-04 10:38:19.444283] read: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","-c","core.bare=false","log","refs/heads/git-annex..ee9e429a3b847010adf65665e4dfe0194c46b819","-n1","--pretty=%H"]
+[2016-04-04 10:38:19.487988] process done ExitSuccess
+[2016-04-04 10:38:19.496808] chat: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","-c","core.bare=false","cat-file","--batch"]
+(from origin...)
+[2016-04-04 10:38:19.62301] read: rsync ["--progress","--inplace","-e","'ssh' '-S' '/data/data/ga.androidterm/tmp/ssh/anarcat@anarc.at' '-o' 'ControlMaster=auto' '-o' 'ControlPersist=yes' '-T' 'anarcat@anarc.at' 'git-annex-shell ''sendkey'' ''/srv/mp3'' ''--debug'' ''SHA256E-s7413367--bdbba13f0631704bcc96220e3b5f2dfd93b186eaf79ef4c8dcf1f6b3dd9b1397.mp3'' --uuid b7802161-c984-4c9f-8d05-787a29c41cfe ''--'' ''remoteuuid=6f812272-18c8-4346-b68a-f57ae50f657e'' ''unlocked='' ''direct='' ''associatedfile=John Coltrane/Coltrane/02. John Coltrane - Soul eyes.mp3'' ''--'''","--","dummy:",".git/annex/tmp/SHA256E-s7413367--bdbba13f0631704bcc96220e3b5f2dfd93b186eaf79ef4c8dcf1f6b3dd9b1397.mp3"]
+git-annex-shell: bad parameters
+
+Usage: git-annex-shell [-c] command [parameters ...] [option ...]
+
+Plumbing commands:
+
+commit        DIRECTORY          commits any staged changes to the git-annex branch
+configlist    DIRECTORY          outputs relevant git configuration
+dropkey       DIRECTORY KEY ...  drops annexed content for specified keys
+gcryptsetup   DIRECTORY VALUE    sets up gcrypt repository
+inannex       DIRECTORY KEY ...  checks if keys are present in the annex
+lockcontent   DIRECTORY KEY      locks key's content in the annex, preventing it being dropped
+notifychanges DIRECTORY          sends notification when git refs are changed
+recvkey       DIRECTORY KEY      runs rsync in server mode to receive content
+sendkey       DIRECTORY KEY      runs rsync in server mode to send content
+transferinfo  DIRECTORY KEY      updates sender on number of bytes of content received
+
+[2016-04-04 10:38:19.805156] process done ExitFailure 12
+
+  rsync failed -- run git annex again to resume file transfer
+
+  Unable to access these remotes: origin
+rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
+rsync error: error in rsync protocol data stream (code 12) at io.c(224) [Receiver=3.1.0dev]
+
+  Try making some of these repositories available:
+        0f9185ea-8462-4230-8cae-462a1ad0df36 -- anarcat@angela:~/mp3
+        22921df6-ff75-491c-b5d9-5a2aab33a689 -- anarcat@marcos:/media/anarcat/79884590-6445-4a6f-ae12-050b9a7c1912/mp3
+        3f6d8082-6f4b-4faa-a3d9-bd5db1891077 -- anarcat@lab-sc.no-ip.org:mp3
+        4249a4ea-343a-43a8-9bba-457d2ff87c7d -- rachel@topcrapn:~/Musique/MUSIC/anarcat
+        487dda55-d164-4bf1-9d85-66caaa9c0743 -- 300GB hard drive labeled VHS
+        b7802161-c984-4c9f-8d05-787a29c41cfe -- anarcat@marcos:/srv/mp3 [origin]
+        c2ca4a13-9a5f-461b-a44b-53255ed3e2f9 -- anarcat@desktop008:/srv/musique/anarcat/mp3
+        f867da6f-78cb-49be-a0db-d1c8e5f53664 -- n900
+        f8818d12-9882-4ca5-bc0f-04e987888a8d -- anarcat@marcos:/media/anarcat/green_crypt/mp3/
+failed
+git-annex: get: 1 failed
+
+# End of transcript or log.
+"""]]
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+I seem to recall I had that working in the past, and I feel I am probably doing something stupidly wrong, but here I am. Sorry about that, I'll be sure to fix the documentation more clearly (esp. in the [[git-annex-shell]] manpage when I figure it out! --[[anarcat]]
diff --git a/doc/bugs/v6_repo_can_not_restore_files_with_executable_permission/comment_1_054ed86d3787ed0f7bc393e7a17d8b6b._comment b/doc/bugs/v6_repo_can_not_restore_files_with_executable_permission/comment_1_054ed86d3787ed0f7bc393e7a17d8b6b._comment
new file mode 100644
index 000000000..8fd5532a7
--- /dev/null
+++ b/doc/bugs/v6_repo_can_not_restore_files_with_executable_permission/comment_1_054ed86d3787ed0f7bc393e7a17d8b6b._comment
@@ -0,0 +1,31 @@
+[[!comment format=mdwn
+ username="ExGen"
+ subject="Same"
+ date="2016-04-03T13:47:26Z"
+ content="""
+I have this problem on windows v6 too:
+
+	$ git annex get test
+	get test (from laptop...)
+	SHA256E-s14488367--4391729b982439764813156e1bfc12e9626ae89452ab812f5180c376fbd57fc0
+		 14,488,367 100%   63.24MB/s    0:00:00 (xfr#1, to-chk=0/1)
+	(checksum...)
+	git-annex: DeleteFile \".\\test\": permission denied (The process cannot access the file because it is being used by another process.)
+	failed
+	git-annex: get: 1 failed
+	
+I can see only a pointer:
+
+	$ cat test
+	/annex/objects/SHA256E-s14488367--4391729b982439764813156e1bfc12e9626ae89452ab812f5180c376fbd57fc0
+
+`git annex unlock` will do nothing, and:
+
+	$ git annex lock
+	lock test git-annex: content not present; cannot lock
+
+I'll make another bug report.
+
+
+
+"""]]
diff --git a/doc/design/external_special_remote_protocol/comment_22_0387827d94f141be53458807da9c2fc2._comment b/doc/design/external_special_remote_protocol/comment_22_0387827d94f141be53458807da9c2fc2._comment
new file mode 100644
index 000000000..50add1229
--- /dev/null
+++ b/doc/design/external_special_remote_protocol/comment_22_0387827d94f141be53458807da9c2fc2._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="szrc"
+ subject="Local storage of creds"
+ date="2016-04-04T03:59:01Z"
+ content="""
+I have a question about local storage of credentials. I assumed that when creds were stored in the repo (because the remote is encrypted or because embedcreds=yes), they wouldn't be stored locally in .git/annex/creds. But it seems they are stored locally, in plaintext, regardless.
+
+Is there a way to prevent this? Ideally, credentials should not be stored plaintext at all...but maybe there's a technical issue I'm not seeing.
+"""]]
diff --git a/doc/encryption/comment_5_5c9897663aaa83ca39a7e8cb292a3fd1._comment b/doc/encryption/comment_5_5c9897663aaa83ca39a7e8cb292a3fd1._comment
new file mode 100644
index 000000000..ee4c2f328
--- /dev/null
+++ b/doc/encryption/comment_5_5c9897663aaa83ca39a7e8cb292a3fd1._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="gavinwahl@d3a94ffbd6df3b8833a53ff11ec435f58f7c44a9"
+ nickname="gavinwahl"
+ subject="Shared key - how many keys?"
+ date="2016-04-03T03:43:58Z"
+ content="""
+In shared mode, is a single key used to encrypt every file in the repository? Or is a new key created for each file?
+
+Shared mode has the properties I need - getting access to the git repo should give you access to all the content. BUT, if one loses access to updates to the git repo, they should not have access to files added after they lost access.
+"""]]
diff --git a/doc/forum/Android__58___Cabal_hell/comment_2_ed5b2b37d37278458fdf2dc37539e741._comment b/doc/forum/Android__58___Cabal_hell/comment_2_ed5b2b37d37278458fdf2dc37539e741._comment
new file mode 100644
index 000000000..0dba07c3c
--- /dev/null
+++ b/doc/forum/Android__58___Cabal_hell/comment_2_ed5b2b37d37278458fdf2dc37539e741._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425"
+ nickname="freewheelinfranks"
+ subject="Makes sense."
+ date="2016-04-02T23:41:23Z"
+ content="""
+Okay, thanks for the information.
+
+How should I send you the icons? I have sent you an email with a zip file of the icons. If that is not appropriate, please let me know.
+"""]]
diff --git a/doc/forum/Feature_request__58___webapp_support_for_centralized_bare_repos/comment_1_0522e3df450efb6b2d264857e07997dc._comment b/doc/forum/Feature_request__58___webapp_support_for_centralized_bare_repos/comment_1_0522e3df450efb6b2d264857e07997dc._comment
new file mode 100644
index 000000000..16c58c469
--- /dev/null
+++ b/doc/forum/Feature_request__58___webapp_support_for_centralized_bare_repos/comment_1_0522e3df450efb6b2d264857e07997dc._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626"
+ nickname="ovidiu"
+ subject="comment 1"
+ date="2016-04-04T11:24:38Z"
+ content="""
+seconded
+"""]]
diff --git a/doc/forum/Feature_request__58___webapp_support_for_centralized_bare_repos/comment_2_e0fc126b0d500d41a563b076a4f6ed6d._comment b/doc/forum/Feature_request__58___webapp_support_for_centralized_bare_repos/comment_2_e0fc126b0d500d41a563b076a4f6ed6d._comment
new file mode 100644
index 000000000..bbcd0e792
--- /dev/null
+++ b/doc/forum/Feature_request__58___webapp_support_for_centralized_bare_repos/comment_2_e0fc126b0d500d41a563b076a4f6ed6d._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626"
+ nickname="ovidiu"
+ subject="comment 2"
+ date="2016-04-04T11:25:33Z"
+ content="""
+sorry, forgot to check the box for: \"email replies to me\" which was the sole purpose of commenting.
+"""]]
diff --git a/doc/todo/smudge/comment_8_ab39263b7145094a9eb4a86bb5410421._comment b/doc/todo/smudge/comment_8_ab39263b7145094a9eb4a86bb5410421._comment
new file mode 100644
index 000000000..7f8882a50
--- /dev/null
+++ b/doc/todo/smudge/comment_8_ab39263b7145094a9eb4a86bb5410421._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="ExGen"
+ subject="Harlinks"
+ date="2016-04-02T23:32:24Z"
+ content="""
+Why not use **hardlinks** on Windows? This could fix \"only direct mode\" issue too. 
+Symlinks on windows sure want admin privilege but hardlinks won't. At least not with this tool: 
+<http://schinagl.priv.at/nt/ln/ln.html>
+"""]]
diff --git a/doc/todo/smudge/comment_9_e194d6371384f2db560f026d6ef728ff._comment b/doc/todo/smudge/comment_9_e194d6371384f2db560f026d6ef728ff._comment
new file mode 100644
index 000000000..104fc6ffe
--- /dev/null
+++ b/doc/todo/smudge/comment_9_e194d6371384f2db560f026d6ef728ff._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="ExGen"
+ subject="Harlinks"
+ date="2016-04-03T11:21:02Z"
+ content="""
+Also I tried now and confirmed both git's ln and cygwin's ln work on windows with hardlink, and it's supported since XP.
+"""]]