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

7 files changed, 143 insertions, 1 deletions

diff --git a/doc/bugs/Files_in___34__here__34___not_known_to_git_annex.mdwn b/doc/bugs/Files_in___34__here__34___not_known_to_git_annex.mdwn
new file mode 100644
index 000000000..8a389025f
--- /dev/null
+++ b/doc/bugs/Files_in___34__here__34___not_known_to_git_annex.mdwn
@@ -0,0 +1,50 @@
+### Please describe the problem.
+
+Not sure how I created this mess. But here, I have my git annex repository:
+
+    $ cat .git/config 
+    [annex]
+    	uuid = 206e9fb3-0c68-4c45-a3d7-dad1d9425d28
+    	version = 5
+
+And judging from this, I would expect the file to be present:
+
+    $ git annex log Movies/Bad\ Taste\ -\ Englisch.avi 
+    - 2015-10-28 20:51:42 Movies/Bad Taste - Englisch.avi | f53b3f8a-0f04-11e1-93ae-136c6986c818 -- jeff-media [kent]
+    + 2014-10-13 00:12:50 Movies/Bad Taste - Englisch.avi | 206e9fb3-0c68-4c45-a3d7-dad1d9425d28 -- 1T
+    + 2011-12-24 13:38:23 Movies/Bad Taste - Englisch.avi | 9dd8c662-296d-11e1-b28a-f3c66fd5e263 -- 500G
+    - 2011-12-18 14:59:38 Movies/Bad Taste - Englisch.avi | 9dd8c662-296d-11e1-b28a-f3c66fd5e263 -- 500G
+    + 2011-12-18 12:48:17 Movies/Bad Taste - Englisch.avi | 9dd8c662-296d-11e1-b28a-f3c66fd5e263 -- 500G
+    + 2011-11-14 22:15:57 Movies/Bad Taste - Englisch.avi | f53b3f8a-0f04-11e1-93ae-136c6986c818 -- jeff-media [kent]
+    $ ls -l Movies/Bad\ Taste\ -\ Englisch.avi
+    lrwxrwxrwx 1 jojo jojo 135 Okt  7  2014 Movies/Bad Taste - Englisch.avi -> ../.git/annex/objects/Wx/P0/WORM-s723351552-m1100368371--Bad Taste - Englisch.avi/WORM-s723351552-m1100368371--Bad Taste - Englisch.avi
+    $ ls -shL Movies/Bad\ Taste\ -\ Englisch.avi
+    690M Movies/Bad Taste - Englisch.avi
+
+But git annex seems to be very confused:
+
+    $ git annex whereis Movies/Bad\ Taste\ -\ Englisch.avi 
+    whereis Movies/Bad Taste - Englisch.avi (0 copies) failed
+    git-annex: whereis: 1 failed
+    $ git annex list Movies/Bad\ Taste\ -\ Englisch.avi 
+    here
+    |kent-direct
+    ||kent
+    |||web
+    ||||bittorrent
+    |||||
+    _____ Movies/Bad Taste - Englisch.avi
+    $ git annex fsck  Movies/Bad\ Taste\ -\ Englisch.avi 
+    fsck Movies/Bad Taste - Englisch.avi (fixing location log) 
+      ** No known copies exist of Movies/Bad Taste - Englisch.avi
+    failed
+    (recording state in git...)
+    git-annex: fsck: 1 failed
+
+The `fsck` call does not change anything about the problem.
+
+File system is ext4.
+
+### What version of git-annex are you using? On what operating system?
+
+git-annex version: 5.20151019-1, Debian unstable.
diff --git a/doc/bugs/standalone_builds_shouldn__39__t_pollute___126____47__.ssh_with_helpers_merely_upon_annex_init.mdwn b/doc/bugs/standalone_builds_shouldn__39__t_pollute___126____47__.ssh_with_helpers_merely_upon_annex_init.mdwn
new file mode 100644
index 000000000..8d9580de4
--- /dev/null
+++ b/doc/bugs/standalone_builds_shouldn__39__t_pollute___126____47__.ssh_with_helpers_merely_upon_annex_init.mdwn
@@ -0,0 +1,14 @@
+### Please describe the problem.
+
+Currently if I using standalone annex builds mere 'annex init' immediately rushes to generate .ssh/git-annex-{shell,wrapper} helpers.  I would really prefer to keep ~/.ssh untouched by any magic from the tools which presumably unrelated to ssh.  Moreover it leads to failures such as 
+
+/usr/lib/git-annex.linux/runshell: 67: /usr/lib/git-annex.linux/runshell: cannot create /.ssh/git-annex-wrapper: Directory nonexistent
+
+happen if HOME was overridden (e.g. for testing etc) and I have no intent to use annex as an assistant etc.
+
+Originally described in http://git-annex.branchable.com/devblog/day_155__missing_bits/ as a solution to overcome problems with assistant's server operation from standalone builds.  Why those couldn't be installed alongside with git-annex wrapper? (actually there is also git-annex-shell at least in the Debian standalone packages)
+
+
+### What version of git-annex are you using? On what operating system?
+
+5.20150916+gitg79661ef-1~ndall+1
diff --git a/doc/forum/How_does_git-annex_handle_rsyncing_between_different_OSes_with_regards_to_UTF-8__63__.mdwn b/doc/forum/How_does_git-annex_handle_rsyncing_between_different_OSes_with_regards_to_UTF-8__63__.mdwn
new file mode 100644
index 000000000..5bbbd5970
--- /dev/null
+++ b/doc/forum/How_does_git-annex_handle_rsyncing_between_different_OSes_with_regards_to_UTF-8__63__.mdwn
@@ -0,0 +1,4 @@
+I'm interested in using git-annex on a freebsd system and an OSX system. 
+I have previously had problems with manually rsyncing due to the fact that apparently different types of UTF-8 are used namely:  UTF-8 NFC & UTF-8 NFD so one option is to use  rsync -a --iconv=utf-8-mac,utf-8 localdir/ mynas:remotedir/ or alternatively, I can mount the files on the NAS via a cifs share and rsync to it...
+
+just curios how git-annex deals with this issue or if i will run into issues due to filenames containing special characters?
diff --git a/doc/tips/fully_encrypted_git_repositories_with_gcrypt/comment_16_c1194234e9f4fd469fa4b9fea72219e1._comment b/doc/tips/fully_encrypted_git_repositories_with_gcrypt/comment_16_c1194234e9f4fd469fa4b9fea72219e1._comment
new file mode 100644
index 000000000..1a091fee4
--- /dev/null
+++ b/doc/tips/fully_encrypted_git_repositories_with_gcrypt/comment_16_c1194234e9f4fd469fa4b9fea72219e1._comment
@@ -0,0 +1,32 @@
+[[!comment format=mdwn
+ username="jonas@1491caea7d71fcf350b6f200807141f1b59857b8"
+ nickname="jonas"
+ subject="gcrypt and map"
+ date="2015-10-27T10:14:17Z"
+ content="""
+I'm having a problem generating a proper annex map where one of the remotes is gcrypt. Specifically, the map command fails as per below. I will concede that it's not clear though if the failure is that of encryptedown, or the third and final remote dsown, which is an rsync one.
+
+jonas@silk:~/own$ git annex map
+map /home/jonas/own ok
+map encryptedown 
+failed
+jonas@silk:~/own$ git annex info encryptedown
+remote: encryptedown
+description: VM / Montreal / gcrypt [encryptedown]
+uuid: 51ee1422-67d5-56f5-83f3-2718c9996080
+cost: 250.0
+type: gcrypt
+repository location: ssh://198.50.187.233/home/jonas/encryptedown/
+encryption: encrypted (to gpg keys: 0C5161298A31D11A) (hybrid mode)
+chunking: none
+jonas@silk:~/own$ git annex info dsown
+remote: dsown
+description: DiskStation NAS / Asgatan / rsync [dsown]
+uuid: ef3b81aa-47bd-41b4-8672-e371742306cf
+cost: 250.0
+type: rsync
+url: diskstation:/volume1/silkbackup/
+encryption: encrypted (encryption key stored in git repository)
+chunking: none
+
+"""]]
diff --git a/doc/todo/Amazon_Cloud_Drive.mdwn b/doc/todo/Amazon_Cloud_Drive.mdwn
index 80df302a7..501c9fa50 100644
--- a/doc/todo/Amazon_Cloud_Drive.mdwn
+++ b/doc/todo/Amazon_Cloud_Drive.mdwn
@@ -4,7 +4,7 @@ It's just became unlimited for a fair price: $60/year ( https://www.amazon.com/c
 
 http://techcrunch.com/2015/03/26/amazon-goes-after-dropbox-google-microsoft-with-unlimited-cloud-drive-storage/
 
--- bence
+-- bence aka [[parhuzamos]] 
 
 > Not yet, but I just need to investigate haskell api bindings for it, I
 > suppose. --[[Joey]]
diff --git a/doc/todo/When_autostarting_the_assistant_on_boot_delay_the_execution_2min.mdwn b/doc/todo/When_autostarting_the_assistant_on_boot_delay_the_execution_2min.mdwn
new file mode 100644
index 000000000..08a24bcb1
--- /dev/null
+++ b/doc/todo/When_autostarting_the_assistant_on_boot_delay_the_execution_2min.mdwn
@@ -0,0 +1,34 @@
+I think the assistant should have a delay before starting so it doesn't impact on the system boot performance.
+
+I know this can be configured per user (I have it set to 5min), but I think 2min is a sane default.
+
+I don't really know how to submit patches (I can't attach it), so I simply copy it here. It's trivial enough.
+
+[[!format txt """
+From bc6b90ce333659bd2511eedd4ab9067241f73780 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= <jonander.penalba@gmail.com>
+Date: Wed, 28 Oct 2015 12:00:51 +0100
+Subject: [PATCH] When autostarting the assistant on boot delay the execution
+ 2min
+
+---
+ Assistant/Install/AutoStart.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Assistant/Install/AutoStart.hs b/Assistant/Install/AutoStart.hs
+index 5745030..6a09c3a 100644
+--- a/Assistant/Install/AutoStart.hs
++++ b/Assistant/Install/AutoStart.hs
+@@ -35,6 +35,6 @@ fdoAutostart command = genDesktopEntry
+ 	"Git Annex Assistant"
+ 	"Autostart"
+ 	False
+-	(command ++ " assistant --autostart")
++	(command ++ " assistant --autostart --startdelay=120")
+ 	Nothing
+ 	[]
+-- 
+2.6.2
+
+
+"""]]
diff --git a/doc/users/parhuzamos.mdwn b/doc/users/parhuzamos.mdwn
new file mode 100644
index 000000000..df5322940
--- /dev/null
+++ b/doc/users/parhuzamos.mdwn
@@ -0,0 +1,8 @@
+My life with git-annex
+
+Todos: 
+
+- publish git-annex scripts
+
+[[!inline pages="todo/* and !todo/done and !link(todo/done) and
+link(users/parhuzamos)" sort=mtime feeds=no actions=yes archive=yes show=0]]