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

3 files changed, 49 insertions, 0 deletions

diff --git a/doc/bugs/unlock_with_absolute_path__63__.mdwn b/doc/bugs/unlock_with_absolute_path__63__.mdwn
new file mode 100644
index 000000000..c54604fa1
--- /dev/null
+++ b/doc/bugs/unlock_with_absolute_path__63__.mdwn
@@ -0,0 +1,33 @@
+### Please describe the problem.
+
+"git annex unlock" with an absolute path appears to do nothing.  Is this a feature or a bug?
+
+### What steps will reproduce the problem?
+
+[[!format sh """
+> mkdir git_annex_test && cd git_annex_test/
+> git init
+> git annex init "Local copy"
+> touch foo.txt
+> git annex add foo.txt
+> git commit -m "Checkin"
+> git annex unlock foo.txt    (correct behavior)
+> git annex lock --force foo.txt
+> git annex unlock /absolute/path/to/git_annex_test/foo.txt    (appears to do nothing)
+"""]]
+
+### What version of git-annex are you using? On what operating system?
+
+Ubuntu 14.04.02 with git-annex from repo:
+
+[[!format sh """
+> git annex --version
+git-annex version: 5.20140412ubuntu1
+build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
+local repository version: 5
+supported repository version: 5
+upgrade supported from repository versions: 0 1 2 4
+""" ]]
+
diff --git a/doc/git-annex-direct/comment_1_5d6f9e9393e534e027ddcd555861196b._comment b/doc/git-annex-direct/comment_1_5d6f9e9393e534e027ddcd555861196b._comment
new file mode 100644
index 000000000..4b94b68fe
--- /dev/null
+++ b/doc/git-annex-direct/comment_1_5d6f9e9393e534e027ddcd555861196b._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="tomekwi"
+ subject="direct mode within a directory?"
+ date="2015-06-13T13:03:33Z"
+ content="""
+Hi, is it possible to enable direct mode only on a single directory?
+
+I can’t use symlinks on a part of my repo because of interoperability with http://tagspaces.org . And I don’t want to have all of my repo in direct mode.
+"""]]
diff --git a/doc/git-annex-direct/comment_2_ef8ac748470549776c1ee299b062add2._comment b/doc/git-annex-direct/comment_2_ef8ac748470549776c1ee299b062add2._comment
new file mode 100644
index 000000000..2329a5ee8
--- /dev/null
+++ b/doc/git-annex-direct/comment_2_ef8ac748470549776c1ee299b062add2._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="tomekwi"
+ subject="…"
+ date="2015-06-13T13:07:49Z"
+ content="""
+Using submodules to split the repo doesn’t work cleanly for me, by the way.
+"""]]