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

9 files changed, 215 insertions, 0 deletions

diff --git a/doc/bugs/.mdwn b/doc/bugs/.mdwn
new file mode 100644
index 000000000..6e3126693
--- /dev/null
+++ b/doc/bugs/.mdwn
@@ -0,0 +1,44 @@
+### Please describe the problem.
+git annex sync fails with "error while loading shared libraries: hostname: cannot open shared object file: No such file or directory" with hostname being the hostname of the remote git annex repo.
+
+### What steps will reproduce the problem?
+Running "git annex sync" in a normal git annex repo.
+
+### What version of git-annex are you using? On what operating system?
+Arch Linux with git-annex from the git-annex-bin AUR package:
+git-annex version: 5.20150317-g237d5b0
+
+build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA
+
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E MD5E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 MD5 WORM URL
+
+remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+
+### Please provide any additional information below.
+people describing the same problem here: <https://aur.archlinux.org/packages/git-annex-bin/>
+
+SSH and normal git operations work fine.
+
+[[!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
+[dafo@simon-desktop dokumente_ga]$ git annex sync
+commit  ok
+pull leno 
+dafo@leno: error while loading shared libraries: dafo@leno: cannot open shared object file: No such file or directory
+fatal: Could not read from remote repository.
+Please make sure you have the correct access rights
+and the repository exists.
+failed
+push leno 
+dafo@leno: error while loading shared libraries: dafo@leno: cannot open shared object file: No such file or directory
+fatal: Could not read from remote repository.
+Please make sure you have the correct access rights
+and the repository exists.
+  Pushing to leno failed.
+  (non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git config)
+failed
+git-annex: sync: 2 failed
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_/comment_2_82f1c3c6aaeb488582ee08518b193f99._comment b/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_/comment_2_82f1c3c6aaeb488582ee08518b193f99._comment
new file mode 100644
index 000000000..457c288dd
--- /dev/null
+++ b/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_/comment_2_82f1c3c6aaeb488582ee08518b193f99._comment
@@ -0,0 +1,27 @@
+[[!comment format=mdwn
+ username="clement"
+ subject="Details"
+ date="2015-03-27T10:34:26Z"
+ content="""
+I tried it again with dfifferent usbs and filesystems, and it looks like it only
+happens with VFAT (e.g not ext). Retracing my step, here is what I do:
+
+1. Create a repository on my local machine using git-annex assistant.
+
+2. Create another non-bare repository on a VFAT usb stick and combine the two.
+
+3. Add a file to the local repository
+
+4. I doesn't synchronise and log shows the missing index error.
+
+It also happens the other way around. If I
+
+1. Create a repository on the usb device, and
+
+2. create a paired repository on my machine, I get a straight up
+
+        Internal Server Error
+
+        /mnt/USB/annexdir/.git/index: copyFile: does not exist (No such file or directory)
+
+"""]]
diff --git a/doc/bugs/GETURLS_doesn__39__t_return_URLs_if_prefix_is_provided.mdwn b/doc/bugs/GETURLS_doesn__39__t_return_URLs_if_prefix_is_provided.mdwn
new file mode 100644
index 000000000..f62649815
--- /dev/null
+++ b/doc/bugs/GETURLS_doesn__39__t_return_URLs_if_prefix_is_provided.mdwn
@@ -0,0 +1,35 @@
+### Please describe the problem.
+
+docs say
+GETURLS Key Prefix
+Gets the recorded urls where a Key can be downloaded from. Only urls that start with the Prefix will be returned. The Prefix may be empty to get all urls. (git-annex replies one or more times with VALUE for each url. The final VALUE has an empty value, indicating the end of the url list.
+
+but when I am trying with a prefix -- doesn't return any... expected that one which is present and returned if I don't provide any prefix
+
+### What steps will reproduce the problem?
+
+git clone git://github.com/yarikoptic/datalad -b nf-custom-remotes
+cd datalad
+# there are requirements in requirements.txt, which you might need to install... or just do on smaug
+git checkout 5b9cfd5008151c515f8bccadf39451055ab61b4b  
+DATALAD_LOGLEVEL=1 DATALAD_LOGTARGET=stderr tools/testing/make_test_repo archive r1
+
+### What version of git-annex are you using? On what operating system?
+5.20150302~nd80+1  now tried also with  5.20150318+yoh20150323+1~nd80+1  (ie snapshot from march 23) with the same success
+
+### 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
+
+2015-03-26 15:56:05,612 [Level 1] Sending 'GETURLS SHA256E-s4--181210f8f9c779c26da1d9b2075bde0127302ee0e3fca38c9a83f5b1dd8e5d3b.dat' (base.py:120)
+2015-03-26 15:56:05,613 [Level 1] Received ['VALUE', 'dl+archive:SHA256E-s153--f378a42b6ff4d90091a7dfa37ebe1fe2fc5926eafd12cde1f2ba5fd1bcbf5e1e.tar.gz/d/test.dat'] (base.py:120)
+2015-03-26 15:56:05,613 [Level 1] Received ['VALUE'] (base.py:120)
+
+
+2015-03-26 15:57:37,389 [Level 1] Sending 'GETURLS SHA256E-s4--181210f8f9c779c26da1d9b2075bde0127302ee0e3fca38c9a83f5b1dd8e5d3b.dat dl+archive:' (base.py:120)
+2015-03-26 15:57:37,391 [Level 1] Received ['VALUE'] (base.py:120)
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/for_custom_remotes_provide_enhanced_DIRHASH_which_outputs_full_DIRHASH_to_the_key_load.mdwn b/doc/bugs/for_custom_remotes_provide_enhanced_DIRHASH_which_outputs_full_DIRHASH_to_the_key_load.mdwn
new file mode 100644
index 000000000..df42a4906
--- /dev/null
+++ b/doc/bugs/for_custom_remotes_provide_enhanced_DIRHASH_which_outputs_full_DIRHASH_to_the_key_load.mdwn
@@ -0,0 +1,4 @@
+### Please describe the problem.
+
+Current layout is DIRHASH (of two levels) /KEY/KEY, so I would need to hardcode having that KEY directory.  It might be nice to either make DIRHASH to return full hash directory (but it might break existing special remotes), or supplement with e.g. DIRHASHFULL which would return all the levels necessary to reach the KEY file
+
diff --git a/doc/bugs/git-annex_sync_fails_with___34__error_while_loading_shared_libraries__34__.mdwn b/doc/bugs/git-annex_sync_fails_with___34__error_while_loading_shared_libraries__34__.mdwn
new file mode 100644
index 000000000..fb3f7d434
--- /dev/null
+++ b/doc/bugs/git-annex_sync_fails_with___34__error_while_loading_shared_libraries__34__.mdwn
@@ -0,0 +1,45 @@
+### Please describe the problem.
+git annex sync fails with "error while loading shared libraries: hostname: cannot open shared object file: No such file or directory" with hostname being the hostname of the remote git annex repo.
+
+### What steps will reproduce the problem?
+Running "git annex sync" in a normal git annex repo.
+
+### What version of git-annex are you using? On what operating system?
+Arch Linux with the git-annex-bin package from AUR
+
+git-annex version: 5.20150317-g237d5b0
+build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E MD5E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 MD5 WORM URL
+remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+
+### Please provide any additional information below.
+people describing the same problem here: <https://aur.archlinux.org/packages/git-annex-bin/>
+
+SSH and normal git operations work fine.
+
+The --verbose flag doesn't change the output.
+
+[[!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
+[dafo@simon-desktop dokumente_ga]$ git annex sync
+commit  ok
+pull leno 
+dafo@leno: error while loading shared libraries: dafo@leno: cannot open shared object file: No such file or directory
+fatal: Could not read from remote repository.
+Please make sure you have the correct access rights
+and the repository exists.
+failed
+push leno 
+dafo@leno: error while loading shared libraries: dafo@leno: cannot open shared object file: No such file or directory
+fatal: Could not read from remote repository.
+Please make sure you have the correct access rights
+and the repository exists.
+  Pushing to leno failed.
+  (non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git config)
+failed
+git-annex: sync: 2 failed
+
+# End of transcript or log.
+"""]]
+
diff --git a/doc/bugs/git-annex_sync_fails_with___34__error_while_loading_shared_libraries__34__/comment_1_f9fbaa2232113803db5fe95b7466298f._comment b/doc/bugs/git-annex_sync_fails_with___34__error_while_loading_shared_libraries__34__/comment_1_f9fbaa2232113803db5fe95b7466298f._comment
new file mode 100644
index 000000000..54d87f6b3
--- /dev/null
+++ b/doc/bugs/git-annex_sync_fails_with___34__error_while_loading_shared_libraries__34__/comment_1_f9fbaa2232113803db5fe95b7466298f._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="CandyAngel"
+ subject="comment 1"
+ date="2015-03-27T12:13:44Z"
+ content="""
+This is something to do with sshcaching..
+
+    git annex sync -c annex.sshcaching=false
+
+works for me.
+
+For some reason, it is trying to load the hostnames as a shared library.. which seems like a potential security problem to me.
+"""]]
diff --git a/doc/forum/Adding_files_with_wildcard_on_Mac_Yosemite.mdwn b/doc/forum/Adding_files_with_wildcard_on_Mac_Yosemite.mdwn
new file mode 100644
index 000000000..4d002d997
--- /dev/null
+++ b/doc/forum/Adding_files_with_wildcard_on_Mac_Yosemite.mdwn
@@ -0,0 +1,9 @@
+I've been trying to get all image files added to git annex with a wildcard, with no luck. If I use 'git annex add image.jpg', the file gets added and I can commit it. Also using 'git annex add .' works for adding all files. 
+
+Comands I've tried-
+
+git annex add *.jpg     * This outputs to the screen that it's adding each .jpg it finds, but when I go to commit there are 0 files staged.
+git annex add . --include='*.jpg'   * This doesn't return any results.
+
+
+What command should I be using on a Mac to just add all files with a specific extension?
diff --git a/doc/forum/git-annex_on_openSUSE.mdwn b/doc/forum/git-annex_on_openSUSE.mdwn
new file mode 100644
index 000000000..08c3cd22f
--- /dev/null
+++ b/doc/forum/git-annex_on_openSUSE.mdwn
@@ -0,0 +1,20 @@
+I run into some problems installing git-annex on openSuSE:
+
+1) cabal install ends up with the failure:
+
+-->>> ExitFailure 1 network-protocol-xmpp-0.4.6 depends on gnuidn-0.2.1 which failed to install.
+
+2) with the tarball the files are not synchronized, only linked
+
+Here the link to the discussion in a suseforum:
+
+https://forums.opensuse.org/showthread.php/506098-How-to-install-git-annex-on-13-1-2
+
+It would be great to see git-annex in the opensuse repos,
+maybe via the open build service, https://build.opensuse.org
+
+Are there other ways to install git-annex on opensuse successfully?
+
+Thanks in advance
+
+saneP
diff --git a/doc/todo/__34__git-annex_fix__34___on_untracked__44___but_git-annexy_symlinks.mdwn b/doc/todo/__34__git-annex_fix__34___on_untracked__44___but_git-annexy_symlinks.mdwn
new file mode 100644
index 000000000..1bdc62174
--- /dev/null
+++ b/doc/todo/__34__git-annex_fix__34___on_untracked__44___but_git-annexy_symlinks.mdwn
@@ -0,0 +1,18 @@
+In my quest to get git-annex to do what I want, even if it is weird and unusual..
+
+Would it be possible for 'git annex fix' to work even on untracked symlinks (perhaps only with '--force'?), where the symlink is otherwise in a git-annexy format?
+
+This would allow me to do stuff like this:
+
+    $ cd ~/old_broken_annex
+    $ cp -t ~/other_annex/presentcheck *
+    $ cd ~/other_annex/presentcheck
+
+    ### This currently does nothing if the symlinks are untracked
+    $ git annex fix --force .
+    
+    $ find -type l -not -xtype l -print0 | xargs -0 git add
+    $ git commit -m "yay, we found some files!"
+    $ find -type l -xtype l -print0 | xargs -0 mv -t ~/files_not_found
+
+Admittedly, to do this now, you just have to stage the symlinks before you fix but there may be other situations where this is useful (and I can't think of anything else you would want 'fix --force' to do)..