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

4 files changed, 117 insertions, 0 deletions

diff --git a/doc/bugs/git-annex_won__39__t_execute_on_WD_My_Cloud_NAS.mdwn b/doc/bugs/git-annex_won__39__t_execute_on_WD_My_Cloud_NAS.mdwn
new file mode 100644
index 000000000..abda58380
--- /dev/null
+++ b/doc/bugs/git-annex_won__39__t_execute_on_WD_My_Cloud_NAS.mdwn
@@ -0,0 +1,58 @@
+### Please describe the problem.
+
+I'm trying to get git-annex running on a WD MyCloud EX2 NAS.
+
+There are a number of issues, I imagine to overcome, a few of which I've already managed to overcome.
+
+
+### What steps will reproduce the problem?
+
+I've managed to get it to work as special remote via rsync. But, it's nowhere near ideal. I was hoping to get working properly by installing git-annex locally on the machine.
+
+FYI, git 2.6.1 is already installed on the NAS.
+
+I can ssh into the NAS no problem. Only user sshd is allowed to ssh, but that's ok. Furthermore, the which command is missing, which prevented webapp lunched on my Mac from creating an rsync remote. Overcame that hurdle by "faking" it:
+[[!format sh """
+    > echo \#\!\/bin\/sh > /usr/bin/which
+    > echo command \-v \$\@ >> /usr/bin/which
+    > chmod +x /usr/bin/which
+"""]]
+
+I've downloaded the latest arm build. After untaring and running runshell successfully, I can't get through the next step, which is running git annex. It results in the following error:
+[[!format sh """
+    > git annex
+    /mnt/HD/HD_a2/git-annex/shimmed/git-annex/git-annex: error while loading shared libraries: /mnt/HD/HD_a2/git-annex/shimmed/git-annex/git-annex: ELF load command alignment not page-aligned
+    fatal: 'annex' appears to be a git command, but we were not able to execute it. Maybe git-annex is broken?
+"""]]
+
+same goes for
+[[!format sh """
+    > runshell git-annex-shell -c git annex:
+    /mnt/HD/HD_a2/Nas_Prog/git-annex/shimmed/git-annex-shell/git-annex-shell: error while loading shared libraries: /mnt/HD/HD_a2/Nas_Prog/git-annex/shimmed/git-annex-shell/git-annex-shell: ELF load command alignment not page-aligned
+"""]]
+
+and pretty much any of the git-annex binaries.
+
+Compiling from source is not an option.
+Any ideas? Thanks.
+
+### What version of git-annex are you using? On what operating system?
+
+I'm trying the latest version of git-annex-standalone-armel.tar.gz downloaded 2015-10-10.
+
+uname -a:  Linux WDMyCloudEX2 3.2.40 #4 Fri Jul 31 16:04:18 CST 2015 armv7l 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)
+
+Sure, runs on my Mac laptop
diff --git a/doc/forum/error_setting_up_centralized_server_on_OSX_-_failed_to_get_annex.uuid_configuration_of_repository_origin.mdwn b/doc/forum/error_setting_up_centralized_server_on_OSX_-_failed_to_get_annex.uuid_configuration_of_repository_origin.mdwn
new file mode 100644
index 000000000..647557e7d
--- /dev/null
+++ b/doc/forum/error_setting_up_centralized_server_on_OSX_-_failed_to_get_annex.uuid_configuration_of_repository_origin.mdwn
@@ -0,0 +1,19 @@
+I'm attempting to set up a centralized git repository to use with git-annex as specified on https://git-annex.branchable.com/tips/centralized_git_repository_tutorial/on_your_own_server/
+
+I'm using macbooks as clients and servers. They are all running git-annex version 5.20150916 installed through homebrew. The server is running 10.10 Yosemite and the clients are running 10.9 Mavericks. There is a symlink on the server in ```/usr/bin/git-annex``` and ```/usr/bin/git-annex-shell``` to ```/usr/local/bin/git-annex``` and ```/usr/local/bin/git-annex-shell```, which then symlinks to the latest version in homebrew's directories. I did this because I was previously facing an error where git-annex was not found on the server (it would not work if you ran <code>ssh tom@server git-annex</code>).
+
+I'm currently at the step after cloning and cding into the repository on the client. When I attempt to run <code>git annex init 'Tom Macbook'</code>, I get the following error:
+
+```
+git annex init 'Tom Macbook'
+init Tom Macbook
+Failed to get annex.uuid configuration of repository origin
+
+Instead, got: "annex.uuid=\ncore.gcrypt-id=\n"
+
+This is unexpected; please check the network transport!
+ok
+(recording state in git...)
+```
+
+I'm really stumped here. Any suggestions? Thanks. Let me know if I can provide any further info. 
diff --git a/doc/walkthrough/renaming_files/comment_1_c05f70079c265d23e882f92aaa4d28f8._comment b/doc/walkthrough/renaming_files/comment_1_c05f70079c265d23e882f92aaa4d28f8._comment
new file mode 100644
index 000000000..9173399ae
--- /dev/null
+++ b/doc/walkthrough/renaming_files/comment_1_c05f70079c265d23e882f92aaa4d28f8._comment
@@ -0,0 +1,31 @@
+[[!comment format=mdwn
+ username="ptspts@d0db5f2b8c4e6befae8899f31c117d093913f43e"
+ nickname="ptspts"
+ subject="renaming oesn't work as expected when changing the extension"
+ date="2015-10-15T08:54:08Z"
+ content="""
+I tried to rename a `.gif` file to `.jpg`:
+
+    $ git annex version
+    git-annex version: 5.20140127
+    build flags: S3 DBus 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 tahoe glacier hook external
+    local repository version: 5
+    supported repository version: 5
+    upgrade supported from repository versions: 0 1 2 4
+    $ find .git/annex/objects -type f
+    .git/annex/objects/JW/wq/SHA256E-s231374848--01ca5e0bb09d068f15ccbf9b064b72f573198bd7516ff8edc72e455a09bf9bd4.gif/SHA256E-s231374848--01ca5e0bb09d068f15ccbf9b064b72f573198bd7516ff8edc72e455a09bf9bd4.gif
+    $ git mv foo.gif foo.jpg
+    $ git commit -a -m renamed
+    ...
+    $ git annex fsck
+    ...
+    $ find .git/annex/objects -type f
+    .git/annex/objects/JW/wq/SHA256E-s231374848--01ca5e0bb09d068f15ccbf9b064b72f573198bd7516ff8edc72e455a09bf9bd4.gif/SHA256E-s231374848--01ca5e0bb09d068f15ccbf9b064b72f573198bd7516ff8edc72e455a09bf9bd4.gif
+    $ ls -l foo.jpg
+    lrwxrwxrwx 1 pts pts 202 Oct 15 10:36 foo.jpg -> .git/annex/objects/JW/wq/SHA256E-s231374848--01ca5e0bb09d068f15ccbf9b064b72f573198bd7516ff8edc72e455a09bf9bd4.gif/SHA256E-s231374848--01ca5e0bb09d068f15ccbf9b064b72f573198bd7516ff8edc72e455a09bf9bd4.gif
+
+I would expect that the last extension printed is .jpg, rather than .gif. How do I make git-annex fix that, preferably without calling `git annex fsck`, which is very slow, because it rehashes the file?
+
+"""]]
diff --git a/doc/walkthrough/renaming_files/comment_2_fe83c600e080131b3109fe616940a25e._comment b/doc/walkthrough/renaming_files/comment_2_fe83c600e080131b3109fe616940a25e._comment
new file mode 100644
index 000000000..7afbd1e03
--- /dev/null
+++ b/doc/walkthrough/renaming_files/comment_2_fe83c600e080131b3109fe616940a25e._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="CandyAngel"
+ subject="comment 2"
+ date="2015-10-15T10:59:59Z"
+ content="""
+*migrate* takes the *--force* option (introduced 5.20150327), allowing you to migrate files to the backend they are already using, but using the new extension. It was actually added for this use case!
+
+This may still incur a hash of the file though as, I believe, *migrate* will check the file at the old key is valid. You will also end up with 2 versions of the file in .git/annex/objects though (you can clean it up with *unused*).
+"""]]