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

3 files changed, 134 insertions, 0 deletions

diff --git a/doc/bugs/cannot_add_a_files_with_an_accent_in_it/comment_3_7c34ada3c7b413f2b622149b60757f6e._comment b/doc/bugs/cannot_add_a_files_with_an_accent_in_it/comment_3_7c34ada3c7b413f2b622149b60757f6e._comment
new file mode 100644
index 000000000..a30e2259e
--- /dev/null
+++ b/doc/bugs/cannot_add_a_files_with_an_accent_in_it/comment_3_7c34ada3c7b413f2b622149b60757f6e._comment
@@ -0,0 +1,37 @@
+[[!comment format=mdwn
+ username="Alan"
+ avatar="http://cdn.libravatar.org/avatar/9cbc26346f1c693d7df198e662a5fdae"
+ subject="Issue still present"
+ date="2017-03-10T07:32:16Z"
+ content="""
+I'm still having this issue, now with a folder. I added several files:
+
+    % git annex add Théâtre\ Augustin\ 2016/*                                           
+    add Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Bizarre, Bizarre.webm ok
+    add Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Conte A Rebours.webm ok
+    add Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Coup De Theatre.webm ok
+    add Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Inspecteur Toutou.webm ok
+    add Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - La Princesse Qui Disait Toujours Non.webm ok
+    add Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Le Magicien Qui Aimait Les Bonbons.webm ok
+    (recording state in git...)
+
+and they show as both added and untracked
+
+    % git annex status                                                                 
+    A Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Bizarre, Bizarre.webm
+    A Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Conte A Rebours.webm
+    A Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Coup De Theatre.webm
+    A Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Inspecteur Toutou.webm
+    A Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - La Princesse Qui Disait Toujours Non.webm
+    A Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Le Magicien Qui Aimait Les Bonbons.webm
+    ? Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Bizarre, Bizarre.webm
+    ? Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Conte A Rebours.webm
+    ? Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Coup De Theatre.webm
+    ? Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Inspecteur Toutou.webm
+    ? Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - La Princesse Qui Disait Toujours Non.webm
+    ? Théâtre Augustin 2016/Juin 2016 - Les Ptits du Madrigal - Le Magicien Qui Aimait Les Bonbons.webm
+
+It seems to be related to this: https://stackoverflow.com/questions/11968183/how-to-handle-accented-characters-in-file-names-in-git-on-mac-os-x-converted-to
+
+I “solved“ the issue by doing a git add of the repository, but I'm wondering what options I need to use with git to avoid such issues in the future.
+"""]]
diff --git a/doc/bugs/git_annex_testremote_fails_on_OSX_because_native___39__mktemp_-d__39___doesn__39__t_work.mdwn b/doc/bugs/git_annex_testremote_fails_on_OSX_because_native___39__mktemp_-d__39___doesn__39__t_work.mdwn
new file mode 100644
index 000000000..539cdc527
--- /dev/null
+++ b/doc/bugs/git_annex_testremote_fails_on_OSX_because_native___39__mktemp_-d__39___doesn__39__t_work.mdwn
@@ -0,0 +1,87 @@
+### Please describe the problem.
+
+Created a special remote using one drive.
+ran git annex testremote <that remote>
+got errors, apparently starting with:
+
+    retrieveKeyFile:                 usage: mktemp [-d] [-q] [-t prefix] [-u] template ...
+    mktemp [-d] [-q] [-u] -t prefix 
+    FAIL (0.01s
+
+### What steps will reproduce the problem?
+
+As above.
+
+### What version of git-annex are you using? On what operating system?
+OSX 10.10.5 https://downloads.kitenet.net/git-annex/OSX/current/10.10_Yosemite/git-annex.dmg 
+
+### Please provide any additional information below.
+
+Verified that using gnu coreutils mktemp fixes the problem.
+Suggestion: Bundle that with the distribution.
+Along those lines, consider also including rclone and the script git-annex-remote-rclone,
+
+[[!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
+testremote alanr-onedrive (generating test keys...) Remote Tests
+  unavailable remote
+    removeKey:                         Cannot run git-annex-remote-!dne! -- Make sure it's in your PATH and is executable.
+OK
+    storeKey:                          Cannot run git-annex-remote-!dne! -- Make sure it's in your PATH and is executable.
+OK (0.43s)
+    checkPresent:                    OK
+    retrieveKeyFile:                 OK
+    retrieveKeyFileCheap:            OK
+  key size Just 1048576; NoChunks; encryption none
+    removeKey when not present:      2017/03/09 21:48:42 Waiting for deletions to finish 2017/03/09 21:48:42 directory not found
+OK (3.80s)
+    present False:                   2017/03/09 21:48:44 directory not found
+OK (1.89s)
+    storeKey:                        2017/03/09 21:48:46 One drive root 'git-annex-test/70c/e24': Waiting for checks to finish
+2017/03/09 21:48:46 One drive root 'git-annex-test/70c/e24': Waiting for transfers to finish
+2017/03/09 21:48:49 
+Transferred:     1 MBytes (206.541 kBytes/s)
+Errors:                 0
+Checks:                 0
+Transferred:            1
+Elapsed time:        4.9s
+OK (4.97s)
+    present True:                    Total objects: 1 Total size: 1 MBytes (1048576 Bytes)
+OK (2.40s)
+    storeKey when already present:   2017/03/09 21:48:53 One drive root 'git-annex-test/70c/e24': Waiting for checks to finish
+2017/03/09 21:48:53 One drive root 'git-annex-test/70c/e24': Waiting for transfers to finish
+2017/03/09 21:48:53 
+Transferred:      0 Bytes (0 Bytes/s)
+Errors:                 0
+Checks:                 1
+Transferred:            0
+Elapsed time:        1.1s
+OK (1.12s)
+    present True:                    Total objects: 1 Total size: 1 MBytes (1048576 Bytes)
+OK (2.06s)
+    retrieveKeyFile:                 mktemp -d
+usage: mktemp [-d] [-q] [-t prefix] [-u] template ...
+       mktemp [-d] [-q] [-u] -t prefix 
+FAIL (0.01s)
+      failed
+    fsck downloaded object:          OK
+    retrieveKeyFile resume from 33%: FAIL
+      Exception: .git/annex/objects/Kv/9j/SHA256E-s1048576--22c73497372ed998c1e84743a67601e2c9522dc9ce78f180f90a3896313c0f61.this-is-a-test-key/SHA256E-s1048576--22c73497372ed998c1e84743a67601e2c9522dc9ce78f180f90a3896313c0f61.this-is-a-test-key: openBinaryFile: does not exist (No such file or directory)
+    fsck downloaded object:          OK
+    retrieveKeyFile resume from 0:   FAIL
+      Exception: failed to lock content: .git/annex/objects/Kv/9j/SHA256E-s1048576--22c73497372ed998c1e84743a67601e2c9522dc9ce78f180f90a3896313c0f61.this-is-a-test-key/SHA256E-s1048576--22c73497372ed998c1e84743a67601e2c9522dc9ce78f180f90a3896313c0f61.this-is-a-test-key: getFileStatus: does not exist (No such file or directory)
+    fsck downloaded object:          OK
+    retrieveKeyFile resume from end: cp: .git/annex/objects/Kv/9j/SHA256E-s1048576--22c73497372ed998c1e84743a67601e2c9522dc9ce78f180f90a3896313c0f61.this-is-a-test-key/SHA256E-s1048576--22c73497372ed998c1e84743a67601e2c9522dc9ce78f180f90a3896313c0f61.this-is-a-test-key: No such file or directory
+FAIL
+      Exception: failed to lock content: .git/annex/objects/Kv/9j/SHA256E-s1048576--22c73497372ed998c1e84743a67601e2c9522dc9ce78f180f90a3896313c0f61.this-is-a-test-key/SHA256E-s1048576--22c73497372ed998c1e84743a67601e2c9522dc9ce78f180f90a3896313c0f61.this-is-a-test-key: getFileStatus: does not exist (No such file or directory)
+    fsck downloaded object:          OK
+    removeKey when present:          OK (2.78s)
+    present False:                   ^C
+
+# 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)
+
+Just starting but have high hopes :-)
diff --git a/doc/forum/Blacklisting_files___40__so_that_they_get_removed_any_time_a_copy_is_found__41__/comment_4_d95647d91a33d1164a87344939cb769a._comment b/doc/forum/Blacklisting_files___40__so_that_they_get_removed_any_time_a_copy_is_found__41__/comment_4_d95647d91a33d1164a87344939cb769a._comment
new file mode 100644
index 000000000..64282fb32
--- /dev/null
+++ b/doc/forum/Blacklisting_files___40__so_that_they_get_removed_any_time_a_copy_is_found__41__/comment_4_d95647d91a33d1164a87344939cb769a._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="CandyAngel"
+ avatar="http://cdn.libravatar.org/avatar/15c0aade8bec5bf004f939dd73cf9ed8"
+ subject="comment 4"
+ date="2017-03-10T08:11:13Z"
+ content="""
+I use git-annex-metadata to tag files I don't want, then drop the content with that tag[1]. Then it doesn't matter if the content reappears, it'll get pruned at some point. Also easy to find any symlinks pointing at the unwanted content using git-annex-find :)
+
+[1] I actually move it to another remote on a 3TB drive which only has such unwanted content, and then delete it on there when I need more space on it. Doesn't matter if that drive fails, but allows a bit of a window for an \"actually, I do need that\" recovery.
+"""]]