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

doc/bugs/fatal:_git_ls-files:_cannot_generate_relative_filenames_containing___39__..__39__.mdwn

@@ -0,0 +1,49 @@
+### Please describe the problem.
+git annex status returns:
+
+annexed files in working tree: fatal: git ls-files: cannot generate relative filenames containing '..'
+
+There are unlocked files mixed with locked (symlinked) throughout the repository after a commit. 
+Perhaps my repo is in an inconsistent state?
+
+### What steps will reproduce the problem?
+Run git annex status
+
+### What version of git-annex are you using? On what operating system?
+git-annex version: 4.20131106.  Redhat EL6 running on KVM.
+
+### Please provide any additional information below.
+
+[[!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
+[username@box pnt]$ git annex status
+repository mode: indirect
+trusted repositories: 0
+semitrusted repositories: 2
+        00000000-0000-0000-0000-000000000001 -- web
+        1ff41d2d-02bd-4795-88b9-bf3fbbeabef7 -- here
+untrusted repositories: 0
+transfers in progress: none
+available local disk space: 36.86 terabytes (+1 megabyte reserved)
+local annex keys: 35750
+local annex size: 251.11 gigabytes
+annexed files in working tree: fatal: git ls-files: cannot generate relative filenames containing '..'
+0
+size of annexed files in working tree: 0 bytes
+bloom filter size: 16 mebibytes (7.2% full)
+backend usage: 
+        SHA256: 18471
+        SHA256E: 17279
+[username@box pnt]$ git annex version
+git-annex version: 4.20131106
+build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus 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 glacier hook
+local repository version: 3
+default repository version: 3
+supported repository versions: 3 4
+upgrade supported from repository versions: 0 1 2
+
+# End of transcript or log.
+"""]]

doc/bugs/fatal:_git_ls-files:_cannot_generate_relative_filenames_containing___39__..__39__/comment_1_8a4045634bffc29c8147056096b7089d._comment

@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.87"
+ subject="comment 1"
+ date="2013-12-16T16:05:38Z"
+ content="""
+Do you get the same error message if you run:
+
+git -c core.bare=false ls-files --cached --others
+
+What version of git? I cannot find that error message anywhere in the current version.
+
+"""]]

doc/bugs/fatal:_git_ls-files:_cannot_generate_relative_filenames_containing___39__..__39__/comment_2_a1539aaec74074b4667ac27cfcfcccd6._comment

@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnWaZGX4m5Oic-vvIKUJHZLrY5W1G7mtQ4"
+ nickname="Andrew"
+ subject="comment 2"
+ date="2013-12-16T16:11:24Z"
+ content="""
+[username@box pnt]$ git -c core.bare=false ls-files --cached --others
+Unknown option: -c
+usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path]
+           [-p|--paginate|--no-pager] [--no-replace-objects]
+           [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]
+           [--help] COMMAND [ARGS]
+
+[username@box pnt]$ git --version
+git version 1.7.1
+"""]]

doc/bugs/git-annex:_WebDAV_failed_to_write_file:_TlsNotSupported:_user_error.mdwn

@@ -0,0 +1,33 @@
+### Please describe the problem.
+$ WEBDAV_USERNAME=xxx@gmail.com WEBDAV_PASSWORD=xxx git annex initremote box.com type=webdav url=https://dav.box.com/dav/git-annex-Pictures chunksize=75mb encryption=shared
+initremote box.com (encryption setup) (shared cipher) (testing WebDAV server...)
+
+git-annex: WebDAV failed to write file: TlsNotSupported: user error
+failed
+git-annex: initremote: 1 failed
+
+
+### What steps will reproduce the problem?
+Compiled with cabal.
+
+### What version of git-annex are you using? On what operating system?
+git-annex version: 5.20131213
+build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus 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 glacier hook
+local repository version: 3
+default repository version: 3
+supported repository versions: 3 5
+upgrade supported from repository versions: 0 1 2 4
+
+ArchLinux
+
+### Please provide any additional information below.
+
+[[!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
+
+
+# End of transcript or log.
+"""]]

doc/bugs/git-annex:_WebDAV_failed_to_write_file:_TlsNotSupported:_user_error/comment_1_2c54c57f456e4570666fd7a5731dcd27._comment

@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.87"
+ subject="comment 1"
+ date="2013-12-16T16:06:26Z"
+ content="""
+Tested this with the Debian build and it works ok.
+
+TlsNotSupported is a new exception thrown by http-client, which is a very new library. Using an older version of http-conduit should avoid whatever the bug is.
+Probably something to do with http-conduit not using http-client-tls, so http-client is left with no way to handle TLS connections.
+"""]]

doc/bugs/git-annex:_WebDAV_failed_to_write_file:_TlsNotSupported:_user_error/comment_2_c9a9f070b2eaff9f68f603ca1defec81._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.87"
+ subject="comment 2"
+ date="2013-12-16T16:23:10Z"
+ content="""
+This turns out to have been a bug in version 0.5 of the haskell DAV library, and was fixed already in a newer version. So cabal update; cabal install DAV; cabal install git-annex
+"""]]