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

6 files changed, 103 insertions, 0 deletions

diff --git a/doc/bugs/Android:_Several_error_messages___47___warnings/comment_4_5edddd7e90b8f11c52a44abfb891ce25._comment b/doc/bugs/Android:_Several_error_messages___47___warnings/comment_4_5edddd7e90b8f11c52a44abfb891ce25._comment
new file mode 100644
index 000000000..976ead689
--- /dev/null
+++ b/doc/bugs/Android:_Several_error_messages___47___warnings/comment_4_5edddd7e90b8f11c52a44abfb891ce25._comment
@@ -0,0 +1,20 @@
+[[!comment format=mdwn
+ username="dah"
+ subject="comment 4"
+ date="2015-10-10T19:02:56Z"
+ content="""
+
+But how would I configure git-annex assistant in this case?
+
+My plan was to somehow add the information about the repos etc. using the command line interface and then just start the assistant using 'git annex assistant --autostart' as the terminal startup command.
+
+Would that work?
+
+By the way, is there any documentation about how to use the assistant without the web interface?
+
+I could only find information about how to configure the assistant using the web app.
+
+Thanks for your help!
+
+
+"""]]
diff --git a/doc/bugs/Android_CM_5.1_ANDROID__95__ROOT_not_set.mdwn b/doc/bugs/Android_CM_5.1_ANDROID__95__ROOT_not_set.mdwn
new file mode 100644
index 000000000..a4cff4670
--- /dev/null
+++ b/doc/bugs/Android_CM_5.1_ANDROID__95__ROOT_not_set.mdwn
@@ -0,0 +1,38 @@
+### Please describe the problem.
+
+Downloaded git-annex (version for android 5.0) from the website. Upon opening the app for the first time and setting up a repository at /sdcard/annex, the terminal gave out the error.
+
+### What version of git-annex are you using? On what operating system?
+
+Nexus 4 running Cyanogenmod 12.1 (Android 5.1) build 20151007 and 20150901
+
+### Please provide any additional information below.
+Output to the terminal window:
+[[!format sh """
+WARNING: linker: git-annex has text relocations. This is wating memory and prevents security hardening. Please fix.
+__bionic_open_tzdata_path: ANDROID_ROOT not set!
+__bionic_open_tzdata_path: ANDROID_ROOT not set!
+__bionic_open_tzdata_path: ANDROID_ROOT not set!
+__bionic_open_tzdata_path: ANDROID_ROOT not set!
+__bionic_open_tzdata_path: ANDROID_ROOT not set!
+
+Detected a filesystem without fifo support.
+
+Disabling ssh connection caching.
+
+Detected a crippled filesystem.
+
+Enabling direct mode.
+fatal: ../../../../sdcard/annex: '../../../../sdcard/annex' is outside of repository
+(recording state in git...)
+__bionic_open_tzdata_path: ANDROID_ROOT not set!
+__bionic_open_tzdata_path: ANDROID_ROOT not set!
+__bionic_open_tzdata_path: ANDROID_ROOT not set!
+__bionic_open_tzdata_path: ANDROID_ROOT not set!
+__bionic_open_tzdata_path: ANDROID_ROOT not set!
+"""]]
+I can add remote repositories and they show up nicely in the webapp, but no files are ever downloaded.
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+I have a couple of repositories atm, one with my music, another that backs up our family pictures for the family and uses Amazon S3 as a backup.
diff --git a/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_4_1561613ff2f0f3d7b42159d09ae1c7f7._comment b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_4_1561613ff2f0f3d7b42159d09ae1c7f7._comment
new file mode 100644
index 000000000..c7c32dc62
--- /dev/null
+++ b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_4_1561613ff2f0f3d7b42159d09ae1c7f7._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626"
+ nickname="ovidiu"
+ subject="comment 4"
+ date="2015-10-10T10:16:14Z"
+ content="""
+Hi Carl,
+
+thanks for clarifying so the question is, if I don't use my NAS as a client, what other function can I assign, I'd really want to access its files via shares too. Can I make it a backup but keep the files \"in the clear\" so I am able to access them via a share?
+"""]]
diff --git a/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_5_59991756981681648070d03e2277ccbb._comment b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_5_59991756981681648070d03e2277ccbb._comment
new file mode 100644
index 000000000..ca0a79c1c
--- /dev/null
+++ b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_5_59991756981681648070d03e2277ccbb._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw"
+ nickname="Carl"
+ subject="comment 5"
+ date="2015-10-10T18:53:58Z"
+ content="""
+The type of group you have does not change if you have the files accesable from the filenames or not. As long as it is a git remote, that in not bare, or a direct git-annex remote you are good to go. 
+"""]]
diff --git a/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_6_eeafd62249d44b89d1091f0be79b3086._comment b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_6_eeafd62249d44b89d1091f0be79b3086._comment
new file mode 100644
index 000000000..c9f91a709
--- /dev/null
+++ b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_6_eeafd62249d44b89d1091f0be79b3086._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626"
+ nickname="ovidiu"
+ subject="comment 6"
+ date="2015-10-11T16:51:06Z"
+ content="""
+you lost me there. so I'm using the command line on the NAS not the webapp but on the MACbook I do use the webapp.
+so when creating a repo through the webapp I chose:  Remote server - Set up a repository on a remote server using ssh. and then I can chose between: Unencrypted repository, Simple shared encryption and Encrypt with GnuPG key
+
+Unfortunately the descriptions aren't quite that self-explanatory. So far I have tested the 3rd option but here files get stored inside .git/annex/objects so I cannot access the files straight away. 
+I'll be testing a few more option awaiting a reply here, maybe I'll figure it out on my own. 
+The config of hte created repo on the NAS contained this:
+[core]
+        repositoryformatversion = 0
+        filemode = true
+        bare = true
+        sharedrepository = 1
+"""]]
diff --git a/doc/todo/wishlist:_allow_re-adding_without_generating_log_entry.mdwn b/doc/todo/wishlist:_allow_re-adding_without_generating_log_entry.mdwn
new file mode 100644
index 000000000..d9ea181a8
--- /dev/null
+++ b/doc/todo/wishlist:_allow_re-adding_without_generating_log_entry.mdwn
@@ -0,0 +1,9 @@
+I keep a database file in git-annex so it stays synced across several machines. My wrapper when accessing it is basically
+
+    git annex sync --content
+    git annex unlock $database
+    [access database]
+    git annex add $database
+    git annex sync --content
+
+This works fine except it creates an entry in the log for the database file even if that stays unchanged. I would like an option that just returns to the state before `git annex unlock` if the file has not been changed. Maybe `git annex add --restore-unchanged`?