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

12 files changed, 208 insertions, 0 deletions

diff --git a/doc/bugs/STANDARD__95__IA_for_S3_remote_not_working.mdwn b/doc/bugs/STANDARD__95__IA_for_S3_remote_not_working.mdwn
new file mode 100644
index 000000000..92c6d276b
--- /dev/null
+++ b/doc/bugs/STANDARD__95__IA_for_S3_remote_not_working.mdwn
@@ -0,0 +1,60 @@
+### Please describe the problem.
+
+Cannot set S3 remote to use Infrequently accessed.
+
+### What steps will reproduce the problem?
+
+git annex enableremote <remote> storageclass=STANDARD_IA
+
+### What version of git-annex are you using? On what operating system?
+
+5.20150930 on Arch Linux
+
+### Please provide any additional information below.
+
+[[!format sh """
+
+# Trying with RR
+$ git annex enableremote amazon storageclass=REDUCED_REDUNDANCY
+enableremote amazon (encryption update) (hybrid cipher with gpg key XXX) ok
+(recording state in git...)
+
+$ git annex info amazon                                        
+remote: amazon
+description: [amazon]
+uuid: XXX
+trust: semitrusted
+cost: 250.0
+type: S3
+creds: embedded in git repository (gpg encrypted)
+bucket: XXX
+endpoint: s3.amazonaws.com
+port: 80
+storage class: ReducedRedundancy
+# snip
+
+# Trying with IA
+$ git annex enableremote amazon storageclass=STANDARD_IA       
+enableremote amazon (encryption update) (hybrid cipher with gpg key XXX) ok
+(recording state in git...)
+
+$ git annex info amazon                                 
+remote: amazon
+description: [amazon]
+uuid: XXX
+trust: semitrusted
+cost: 250.0
+type: S3
+creds: embedded in git repository (gpg encrypted)
+bucket: XXX
+endpoint: s3.amazonaws.com
+port: 80
+storage class: Standard
+
+# End of transcript or log.
+"""]]
+
+### 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've had great experiences using git annex normally, but the special remotes tend
+to get dicey, like here.
diff --git a/doc/bugs/STANDARD__95__IA_for_S3_remote_not_working/comment_1_e9c097795b7b35f758a9cff782c87fc2._comment b/doc/bugs/STANDARD__95__IA_for_S3_remote_not_working/comment_1_e9c097795b7b35f758a9cff782c87fc2._comment
new file mode 100644
index 000000000..34b5653e1
--- /dev/null
+++ b/doc/bugs/STANDARD__95__IA_for_S3_remote_not_working/comment_1_e9c097795b7b35f758a9cff782c87fc2._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="darkfeline"
+ subject="comment 1"
+ date="2015-10-09T02:25:57Z"
+ content="""
+I should have [searched the forums first](https://git-annex.branchable.com/forum/Is_S3___34__Standard-Infrequent_Access__34___storage_class_supported__63__/).
+
+It looks like the feature has not been merged yet, despite appearing in the documentation on the S3 page.
+"""]]
diff --git a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_8_be1d950835ee47774063e1335dd043e3._comment b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_8_be1d950835ee47774063e1335dd043e3._comment
new file mode 100644
index 000000000..218126f25
--- /dev/null
+++ b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_8_be1d950835ee47774063e1335dd043e3._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4"
+ subject="standalone builds"
+ date="2015-10-08T16:35:10Z"
+ content="""
+Thanks Joey.  So the standalone builds you currently have will still be full featured builds, but where could we get those ones with limited functionality?  may be they could be automated and made available alongside with corresponding description (for older systems, without assistant functionalities such as X and Y)?
+"""]]
diff --git a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_9_805c0e3d4f3d0f3d4c1d4e6e9a5cf032._comment b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_9_805c0e3d4f3d0f3d4c1d4e6e9a5cf032._comment
new file mode 100644
index 000000000..c1d9a876e
--- /dev/null
+++ b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_9_805c0e3d4f3d0f3d4c1d4e6e9a5cf032._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4"
+ subject="ah -- the 32bit build I guess"
+ date="2015-10-08T17:50:50Z"
+ content="""
+ah -- now I saw  the https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-i386-ancient.tar.gz which is I guess as ancient as it could get ;)  unfortunately \"was built without its test suite; not testing\" so can't test but let's see how it performs ;) 
+"""]]
diff --git a/doc/bugs/thread_blocked_indefinitely_in_an_MVar_operation_durin_fsck.mdwn b/doc/bugs/thread_blocked_indefinitely_in_an_MVar_operation_durin_fsck.mdwn
new file mode 100644
index 000000000..f30bc1d52
--- /dev/null
+++ b/doc/bugs/thread_blocked_indefinitely_in_an_MVar_operation_durin_fsck.mdwn
@@ -0,0 +1,35 @@
+### Please describe the problem.
+I try to fsck my movies repo, but run in to a failure message. Running the same command on another repo on the same computer works (both being run with sudo and the same user.)
+
+### What steps will reproduce the problem?
+    $ sudo -u time_machine_carl git annex fsck --incremental-schedule 182d --time-limit 1h 
+
+    sqlite worker thread crashed: SQLite3 returned ErrorCan'tOpen while attempting to perform prepare "SELECT null from fscked limit 1": unable to open database file
+    git-annex: thread blocked indefinitely in an MVar operation
+
+I guess I might just have created a fsck database using another user and this db is somehow locked?
+
+### What version of git-annex are you using? On what operating system?
+
+    $ git annex version
+    git-annex version: 5.20150731-1
+    build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA Database
+    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
+    
+It runs on Raspbian Testing
+    $ uname -a
+    Linux pi 4.1.6+ #810 PREEMPT Tue Aug 18 15:19:58 BST 2015 armv6l GNU/Linux
+### 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.
+"""]]
+
+### 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)
+Of course, The movie archive seems to be filling up nicely I just have some problems automating the checks.
+
diff --git a/doc/forum/Need_some_help_installing_on_freeBSD/comment_5_527bf6df2485c5e906f1d50930ec01fe._comment b/doc/forum/Need_some_help_installing_on_freeBSD/comment_5_527bf6df2485c5e906f1d50930ec01fe._comment
new file mode 100644
index 000000000..535179471
--- /dev/null
+++ b/doc/forum/Need_some_help_installing_on_freeBSD/comment_5_527bf6df2485c5e906f1d50930ec01fe._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626"
+ nickname="ovidiu"
+ subject="comment 5"
+ date="2015-10-07T20:12:20Z"
+ content="""
+thanks, I'll try and use only the assistant, not the webapp on the NAS, any links on how to get started apart from typing git annex? 
+any first steps to take, a particular order in which to do things?
+"""]]
diff --git a/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_2_77d61eceec24d2f41f044a643d8542cc._comment b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_2_77d61eceec24d2f41f044a643d8542cc._comment
new file mode 100644
index 000000000..42e7ab19f
--- /dev/null
+++ b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_2_77d61eceec24d2f41f044a643d8542cc._comment
@@ -0,0 +1,25 @@
+[[!comment format=mdwn
+ username="ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626"
+ nickname="ovidiu"
+ subject="comment 2"
+ date="2015-10-07T20:22:16Z"
+ content="""
+Hi Carl, thanks for the feedback.
+
+I'll be very slowly in replying, taking some late night classes this week but I WILL ask more questions once I get around to try some tests with dummy data.
+
+Meanwhile here is one question that has been bugging me for days now:
+
+Take the following scenario:
+
+- client repo setup on NAS
+- client repo setup on MAcbook
+- backup and archive repos elsewhere (doesn't matter for this question)
+
+So NAS and MACbook are in sync when I decide I don't need a specific folder on the MACbook and archive it.
+
+The big question:
+Will it be archived on the NAS too or not? (assistant running on both devices and please assume there are enough copies of this folder in backup and archive repos)
+
+This is really an important part of understanding git-annex for me as it would simply be a sync tool if it archives on both devices but if it does not it solves my problem of being able to decide waht data to carry with me on my MACbook and still be able to use a VPN and access a share on the NAS (the client repo folder).
+"""]]
diff --git a/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_3_529cada8df4888c12254818c26231835._comment b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_3_529cada8df4888c12254818c26231835._comment
new file mode 100644
index 000000000..3803624c8
--- /dev/null
+++ b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_3_529cada8df4888c12254818c26231835._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw"
+ nickname="Carl"
+ subject="comment 3"
+ date="2015-10-09T08:45:25Z"
+ content="""
+As I understand your question, you will move some files into an \"archive-folder\" The client repo in your mac will then check if it allowed to drop the file. It seem that it will as there are enough copies on S3 et al. After syncing the file structure on the git repo will be updated on your NAS, as it is a client it will also check if it allowed to drop, and as enough copies are available it will. 
+
+If this is not what you want, then you do not want to have your NAS as a client. My setup is not dissimilar from yours, and my home server (corresponding to your NAS) is in the backup group. It thus wants to hold on to everything.
+"""]]
diff --git a/doc/forum/git-annex_add_out_of_memory_error/comment_2_de9d956d95cb41e2372eabbf672e0f67._comment b/doc/forum/git-annex_add_out_of_memory_error/comment_2_de9d956d95cb41e2372eabbf672e0f67._comment
new file mode 100644
index 000000000..0d8fb4bcc
--- /dev/null
+++ b/doc/forum/git-annex_add_out_of_memory_error/comment_2_de9d956d95cb41e2372eabbf672e0f67._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="jec@8edf298ac8f8152bffcd4fdc1a310949d3547fe4"
+ nickname="jec"
+ subject="Git Version"
+ date="2015-10-07T20:24:05Z"
+ content="""
+Thank for the response Joey...
+
+Here's my git version:
+
+    [xxx@infrastructure ~]$ which git
+    /opt/git-annex.linux/git
+    [xxx@infrastructure ~]$ /opt/git-annex.linux/git --version
+    git version 2.6.0
+
+I've doubled the amount of RAM on that VM to 8GB - I'll see what happens when I try another run.
+
+"""]]
diff --git a/doc/forum/git-like_git-annex_diff.mdwn b/doc/forum/git-like_git-annex_diff.mdwn
new file mode 100644
index 000000000..59205d624
--- /dev/null
+++ b/doc/forum/git-like_git-annex_diff.mdwn
@@ -0,0 +1,11 @@
+It took me some trial and error to get `git-annex diffdriver` to work close to the way I wanted (basically, the same way `git diff` works in a normal git repository with `color.ui` set to `always` with `git config`, so I thought I'd put my notes here for others:
+
+* Install `colordiff` (I couldn't figure out what `git`'s actual default diff program was or if it was possible to use it outside of `git diff`, so I went with this.
+* Create a wrapper script to pass to `git-annex diffdriver`. `LANG=C` was to avoid a warning produced by `perl` when it runs `colordiff`. `exit 0` is needed because `colordiff`/`diff` has a non-zero exit status when the files it is passed are not identical and `git` expects the external diff program to exit with status 0:
+
+        #!/usr/bin/env bash                                                             
+        LANG=C colordiff -c "$1" "$2"                                                   
+        exit 0
+
+* Put the wrapper script somewhere on `PATH`, make it executable, and name it something like `git-annex-diff-wrapper`.
+* Configure the repo to use the wrapper: `git config diff.external "git-annex diffdriver -- git-annex-diff-wrapper --"`
diff --git a/doc/special_remotes/S3/comment_18_0dcb84048563fc9e45b66ca8f365f320._comment b/doc/special_remotes/S3/comment_18_0dcb84048563fc9e45b66ca8f365f320._comment
new file mode 100644
index 000000000..b5e776c80
--- /dev/null
+++ b/doc/special_remotes/S3/comment_18_0dcb84048563fc9e45b66ca8f365f320._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="darkfeline"
+ subject="Sharing S3 bucket between repos"
+ date="2015-10-09T01:16:25Z"
+ content="""
+What are the implications of sharing an S3 remote/bucket between two repositories with using fileprefix?  Can this be used to \"deduplicate\" files shared between repositories?
+"""]]
diff --git a/doc/tips/setup_a_public_repository_on_a_web_site/comment_5_55c80fd138dfc8052d2deac39b50a7ce._comment b/doc/tips/setup_a_public_repository_on_a_web_site/comment_5_55c80fd138dfc8052d2deac39b50a7ce._comment
new file mode 100644
index 000000000..5fdcf7dc9
--- /dev/null
+++ b/doc/tips/setup_a_public_repository_on_a_web_site/comment_5_55c80fd138dfc8052d2deac39b50a7ce._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d"
+ nickname="wsha.code+ga"
+ subject="post-receive hook"
+ date="2015-10-09T17:41:51Z"
+ content="""
+The post is pretty clear but I misinterpreted at first and got stuck for a while, so just in case this helps anyone else:
+
+The issues about the `post-receive` hook running in the `.git` directory and `GIT_DIR` being set to `.` are distinct issues and you might need to fix both them. At first, I thought they were the same thing and just doing `cd ..` would be enough to fix things, but it is not.
+"""]]