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

8 files changed, 75 insertions, 0 deletions

diff --git a/doc/design/adjusted_branches/comment_3_e2a4b1719ba9860da711b802de64daf5._comment b/doc/design/adjusted_branches/comment_3_e2a4b1719ba9860da711b802de64daf5._comment
new file mode 100644
index 000000000..a30f4c50c
--- /dev/null
+++ b/doc/design/adjusted_branches/comment_3_e2a4b1719ba9860da711b802de64daf5._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="thowz"
+ subject="adjusting symlink paths"
+ date="2016-05-13T22:32:33Z"
+ content="""
+Another good use case for this would be adjusting the target paths of symlinks for non-standard locations of the .git/annex/objects folder, such as when cloning into a repo where the GIT_DIR is outside the worktree folder, or when someone is using multiple worktrees and the links in other worktrees need to point to the GIT_COMMON_DIR.
+
+[[https://git-scm.com/docs/git-worktree]]<br>
+[[https://stacktoheap.com/blog/2016/01/19/using-multiple-worktrees-with-git/]]
+"""]]
diff --git a/doc/forum/Remote_in_webapp_shows_syncing_disabled_but_is_enabled___40__maybe__41__/comment_4_a8e68a41e069803d89f18d1645876298._comment b/doc/forum/Remote_in_webapp_shows_syncing_disabled_but_is_enabled___40__maybe__41__/comment_4_a8e68a41e069803d89f18d1645876298._comment
new file mode 100644
index 000000000..b303c3afa
--- /dev/null
+++ b/doc/forum/Remote_in_webapp_shows_syncing_disabled_but_is_enabled___40__maybe__41__/comment_4_a8e68a41e069803d89f18d1645876298._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="openmedi"
+ subject="comment 4"
+ date="2016-05-14T13:21:04Z"
+ content="""
+Indeed it was a question of trust. Something that the assistant should notify me about. Maybe it should even be a setting in the assistant. No feedback here is just not a good idea.
+"""]]
diff --git a/doc/forum/__34__git_annex_assistant_--stop__34___doesn__39__t_work_in_OSX_10.11.4/comment_4_5bed42e467859d2310f3da35e55acd38._comment b/doc/forum/__34__git_annex_assistant_--stop__34___doesn__39__t_work_in_OSX_10.11.4/comment_4_5bed42e467859d2310f3da35e55acd38._comment
new file mode 100644
index 000000000..2036ad6ff
--- /dev/null
+++ b/doc/forum/__34__git_annex_assistant_--stop__34___doesn__39__t_work_in_OSX_10.11.4/comment_4_5bed42e467859d2310f3da35e55acd38._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="openmedi"
+ subject="comment 4"
+ date="2016-05-14T13:24:06Z"
+ content="""
+I assume now that the problem is related to the [b2 special remote](https://github.com/encryptio/git-annex-remote-b2) which might be preventing git annex from shutting down. I don't know. What should I do and post here to help you triage this problem?
+"""]]
diff --git a/doc/forum/performance_for_FTP_site_mirroring/comment_3_cb4d7b283f20b43283036f20ebc648ec._comment b/doc/forum/performance_for_FTP_site_mirroring/comment_3_cb4d7b283f20b43283036f20ebc648ec._comment
new file mode 100644
index 000000000..36b1595dd
--- /dev/null
+++ b/doc/forum/performance_for_FTP_site_mirroring/comment_3_cb4d7b283f20b43283036f20ebc648ec._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="midfield"
+ subject="timings"
+ date="2016-05-15T19:58:37Z"
+ content="""
+for what it's worth, even with your suggestions i was unable to make git commit work quickly (it takes over an hour for the initial commit.  it only takes 4 minutes to copy the files themselves.)  thank you for the help though.
+"""]]
diff --git a/doc/forum/unable_to_clone_annex_repo_in_windows/comment_2_e4fcc8329b2deb058b7368ce1c226a3e._comment b/doc/forum/unable_to_clone_annex_repo_in_windows/comment_2_e4fcc8329b2deb058b7368ce1c226a3e._comment
new file mode 100644
index 000000000..828906df7
--- /dev/null
+++ b/doc/forum/unable_to_clone_annex_repo_in_windows/comment_2_e4fcc8329b2deb058b7368ce1c226a3e._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="drunken_sapo"
+ subject="comment 2"
+ date="2016-05-13T18:12:24Z"
+ content="""
+Hey Joey,
+        Thanks for the answer, I'm trying to reproduce it on a test repo, but I'm having problems with my ssh-key. As soon as I fix it I'll be back with the results.
+Thanks for your time and effort.
+Best,
+         Juan
+"""]]
diff --git a/doc/forum/unable_to_clone_annex_repo_in_windows/comment_3_20aa8de2513fdb6b19a4b24f20983f0a._comment b/doc/forum/unable_to_clone_annex_repo_in_windows/comment_3_20aa8de2513fdb6b19a4b24f20983f0a._comment
new file mode 100644
index 000000000..e9e462b56
--- /dev/null
+++ b/doc/forum/unable_to_clone_annex_repo_in_windows/comment_3_20aa8de2513fdb6b19a4b24f20983f0a._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="drunken_sapo"
+ subject="The problem was path length"
+ date="2016-05-14T13:11:35Z"
+ content="""
+After fixing my ssh key problem I was able to test it appropiately.
+The path to the .git directory of my repo is 41 characters long (/d/juan/develop/git/xxxxxx_xxxxx_xxxxxxxx), if we add the offending file name: .git\annex\objects\fca\de3\SHA256E-s1312136--a79e30c5121f7843f023abbd36b211a245385b952926760d55a07baf8da1b24d.png\
+which is 114 characters long, it adds up to 155 characters.
+Moving the repo to /d/xxxxxx_xxxxx_xxxxxxxx solved the problem.
+However, I need it to be on that path, because some other projects use this on a relative path.
+Is there any way to circumvent this issue?
+"""]]
diff --git a/doc/news/version_6.20160511/comment_1_c7ad57b324c94d0a3eb00b9d624f7b66._comment b/doc/news/version_6.20160511/comment_1_c7ad57b324c94d0a3eb00b9d624f7b66._comment
new file mode 100644
index 000000000..a48431dc6
--- /dev/null
+++ b/doc/news/version_6.20160511/comment_1_c7ad57b324c94d0a3eb00b9d624f7b66._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="CandyAngel"
+ subject="comment 1"
+ date="2016-05-16T11:41:08Z"
+ content="""
+I've very happy to report that the git-add, git-annex-fsck & 'git-annex-reinject --known' workflow is working great!
+
+Thank you for adding these :)
+"""]]
diff --git a/doc/special_remotes/directory/comment_15_3d091c87c1e4d1c086fb88ae21137a57._comment b/doc/special_remotes/directory/comment_15_3d091c87c1e4d1c086fb88ae21137a57._comment
new file mode 100644
index 000000000..7e4a08299
--- /dev/null
+++ b/doc/special_remotes/directory/comment_15_3d091c87c1e4d1c086fb88ae21137a57._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="aslkdjasd@656d48eb766881455ee14c8cd4adabdd14aad892"
+ nickname="aslkdjasd"
+ subject="layout reasoning"
+ date="2016-05-14T01:23:42Z"
+ content="""
+@joeyh - trying to understand the purpose behind the layout for the directory and rsync remotes
+
+Format appears to be /BASE_DIR/xxx/yyy/FILEKEY/FILEKEY
+
+What's the purpose of the filekey directory? I.e. why have FILEKEY as both a directory and then a file of the same name inside that directory?
+"""]]