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

9 files changed, 220 insertions, 0 deletions

diff --git a/doc/bugs/adjusted_branches_on_windows__58___file_paths_get_messed_up_when_commiting_to_an_adjusted_branch/comment_2_7ee505eaab4c59a340e1171794660b88._comment b/doc/bugs/adjusted_branches_on_windows__58___file_paths_get_messed_up_when_commiting_to_an_adjusted_branch/comment_2_7ee505eaab4c59a340e1171794660b88._comment
new file mode 100644
index 000000000..7c46df3f8
--- /dev/null
+++ b/doc/bugs/adjusted_branches_on_windows__58___file_paths_get_messed_up_when_commiting_to_an_adjusted_branch/comment_2_7ee505eaab4c59a340e1171794660b88._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="abdo.roig@4afedf09b5d9a0a6a9f44fc16a778e10cc3e89dc"
+ nickname="abdo.roig"
+ subject="Problem fixed"
+ date="2016-05-05T08:32:37Z"
+ content="""
+The reported problem is fixed for me. Thanks a lot!
+"""]]
diff --git a/doc/bugs/annex.gnupg-options_not_used_by_assistant.mdwn b/doc/bugs/annex.gnupg-options_not_used_by_assistant.mdwn
new file mode 100644
index 000000000..3141ca06a
--- /dev/null
+++ b/doc/bugs/annex.gnupg-options_not_used_by_assistant.mdwn
@@ -0,0 +1,80 @@
+### Please describe the problem.
+
+I am using annex with a gcrypt encrypted repository but I am not able to sync content to the remote share via Webapp. If I sync via command line everything is working as expected but via Webapp I receive several error messages complaining about tty not available.
+
+As I workaround I changed two things:
+
+1. /usr/local/bin/git-remote-gcrypt: As $GPG_AGENT_INFO was not set I needed to include "--no-tty" on line 377
+2. Add a line in ~/.gnupg/gpg.conf with option "no-tty"
+
+As this breaks gpg2 for use on command line I wanted to provide the --no-tty via option **annex.gnupg-options** as mentioned in the manual. Not sure what I am doing wrong but the Webapp does not pick up these options.
+
+```
+[annex]
+	gnupg-options = --no-tty
+```
+
+
+### What steps will reproduce the problem?
+
+Create repository via
+
+```sh
+git annex initremote hidrive type=gcrypt gitrepo=rsync.hidrive.strato.com:/users/xxxxxx/hidrive.git chunk=5MiB keyid=XXXXXXXX
+```
+Launch Webapp
+
+```sh
+git annex webapp
+```
+
+Copy files to local annex directory
+
+### What version of git-annex are you using? On what operating system?
+
+OSX 10.11.4
+
+gpg (GnuPG) 2.0.30
+libgcrypt 1.7.0
+Copyright (C) 2015 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+Home: ~/.gnupg
+Supported algorithms:
+Pubkey: RSA, RSA, RSA, ELG, DSA
+Cipher: IDEA, 3DES, CAST5, BLOWFISH, AES, AES192, AES256, TWOFISH,
+        CAMELLIA128, CAMELLIA192, CAMELLIA256
+Hash: MD5, SHA1, RIPEMD160, SHA256, SHA384, SHA512, SHA224
+Compression: Uncompressed, ZIP, ZLIB, BZIP2
+
+
+git-annex version: 6.20160418
+build flags: Assistant Webapp Pairing Testsuite WebDAV FsEvents XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi
+key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL
+remote types: git gcrypt bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+local repository version: 6
+supported repository versions: 5 6
+upgrade supported from repository versions: 0 1 2 4 5
+
+
+### Please provide any additional information below.
+
+[[!format sh """
+
+[2016-05-05 15:04:31.059236] Pusher: Syncing with hidrive 
+(recording state in git...)
+gcrypt: Development version -- Repository format MAY CHANGE
+gpg: cannot open `/dev/tty': Device not configured
+
+  user error (gpg2 ["--quiet","--trust-model","always","--decrypt"] exited 2)
+gpg: cannot open `/dev/tty': Device not configured
+
+  user error (gpg2 ["--quiet","--trust-model","always","--decrypt"] exited 2)
+
+"""]]
+
+### 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)
+
+
diff --git a/doc/forum/Assistant_fails_to_authenticate_to_rsync_remote/comment_2_a395406abd3eb4cf07dc6467506a7e77._comment b/doc/forum/Assistant_fails_to_authenticate_to_rsync_remote/comment_2_a395406abd3eb4cf07dc6467506a7e77._comment
new file mode 100644
index 000000000..e816a5392
--- /dev/null
+++ b/doc/forum/Assistant_fails_to_authenticate_to_rsync_remote/comment_2_a395406abd3eb4cf07dc6467506a7e77._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="annexuser"
+ subject="comment 2"
+ date="2016-05-04T19:16:31Z"
+ content="""
+That makes sense! I'm starting the assistant via systemd, so it probably doesn't have access to my environment to get the ssh keys. Thanks!
+"""]]
diff --git a/doc/forum/Fails_to_get_file_from_s3._How_to_recover__63__/comment_3_471ff0cdb00b311f2a3d801b04e9edef._comment b/doc/forum/Fails_to_get_file_from_s3._How_to_recover__63__/comment_3_471ff0cdb00b311f2a3d801b04e9edef._comment
new file mode 100644
index 000000000..38f6d97f9
--- /dev/null
+++ b/doc/forum/Fails_to_get_file_from_s3._How_to_recover__63__/comment_3_471ff0cdb00b311f2a3d801b04e9edef._comment
@@ -0,0 +1,26 @@
+[[!comment format=mdwn
+ username="annexuser"
+ subject="comment 3"
+ date="2016-05-04T19:15:16Z"
+ content="""
+Thanks. I will try that and see if I can recover the files. Here is the output of git annex info s3:
+
+    remote: s3
+    description: [s3]
+    uuid: 15ac19e4-223a-4c81-b7f7-797b9b026b86
+    trust: semitrusted
+    cost: 250.0
+    type: S3
+    creds: stored locally
+    bucket: s3-15ac19e4-223a-4c81-b7f7-797b9b026b86
+    endpoint: s3.amazonaws.com
+    port: 80
+    storage class: OtherStorageClass \"STANDARD_IA\"
+    partsize: 1.07 gigabytes
+    public: no
+    encryption: encrypted (encryption key stored in git repository)
+    chunking: none
+    remote annex keys: 121924
+    remote annex size: 680.42 gigabytes
+
+"""]]
diff --git a/doc/forum/HowTo_Conflict_Resolution/comment_5_446186626e5b2d08d078e3b48be06bfa._comment b/doc/forum/HowTo_Conflict_Resolution/comment_5_446186626e5b2d08d078e3b48be06bfa._comment
new file mode 100644
index 000000000..a38aaf361
--- /dev/null
+++ b/doc/forum/HowTo_Conflict_Resolution/comment_5_446186626e5b2d08d078e3b48be06bfa._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="Horus"
+ subject="comment 5"
+ date="2016-05-05T10:00:20Z"
+ content="""
+Ok, that something I can understand.
+
+But still, I think, when using git-annex from the command line the situation of a merge conflict is still extremeley hard to handle. What is the reason against adding from which remote the conflicted data comes from?
+"""]]
diff --git a/doc/forum/HowTo_Conflict_Resolution/comment_6_83cafddb480fa9e5b5d87d27b994b2bc._comment b/doc/forum/HowTo_Conflict_Resolution/comment_6_83cafddb480fa9e5b5d87d27b994b2bc._comment
new file mode 100644
index 000000000..008bc623b
--- /dev/null
+++ b/doc/forum/HowTo_Conflict_Resolution/comment_6_83cafddb480fa9e5b5d87d27b994b2bc._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="Horus"
+ subject="comment 6"
+ date="2016-05-05T10:01:21Z"
+ content="""
+Normal git also has merge markers that the tell me about which part is from HEAD, which from the branch to merge.
+"""]]
diff --git a/doc/forum/files_got_replaced_by_broken_symblinks__44___how_to_get_them_back__63__/comment_6_8c4c2e8dc4706ca824cbbc9b2ed62be4._comment b/doc/forum/files_got_replaced_by_broken_symblinks__44___how_to_get_them_back__63__/comment_6_8c4c2e8dc4706ca824cbbc9b2ed62be4._comment
new file mode 100644
index 000000000..4df27e999
--- /dev/null
+++ b/doc/forum/files_got_replaced_by_broken_symblinks__44___how_to_get_them_back__63__/comment_6_8c4c2e8dc4706ca824cbbc9b2ed62be4._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="simon.parzer@f837bbade0d93f560dc574b04e835b7875c4026f"
+ nickname="simon.parzer"
+ subject="comment 6"
+ date="2016-05-05T11:26:03Z"
+ content="""
+To sort of follow up on this after 3 months, ```git annex info``` displays ```repository mode: direct```
+
+I have given up on git annex in the meantime, it is a nightmare to sync between different operating systems/file systems.
+What might be \"wrong\" with my setup is that I have at least two machines that are dual-boot. So I'm using the same folder both in Windows and Linux. I also have an external HD with an annex repository that I plug in to different machines, and it apparently causes problems.
+Now I have to write a python script to recover my lost files from the bottomless abyss that is the .git/annex folder.
+"""]]
diff --git a/doc/forum/files_got_replaced_by_broken_symblinks__44___how_to_get_them_back__63__/comment_7_24b09f1263f6bc6b219085c17ced915c._comment b/doc/forum/files_got_replaced_by_broken_symblinks__44___how_to_get_them_back__63__/comment_7_24b09f1263f6bc6b219085c17ced915c._comment
new file mode 100644
index 000000000..c648d125d
--- /dev/null
+++ b/doc/forum/files_got_replaced_by_broken_symblinks__44___how_to_get_them_back__63__/comment_7_24b09f1263f6bc6b219085c17ced915c._comment
@@ -0,0 +1,49 @@
+[[!comment format=mdwn
+ username="simon.parzer@f837bbade0d93f560dc574b04e835b7875c4026f"
+ nickname="simon.parzer"
+ subject="Python script to recover git annex' lost files"
+ date="2016-05-05T12:01:46Z"
+ content="""
+Maybe someone else needs this at some point :|
+
+Use it at your own risk of course.
+
+    #!python3
+    
+    import os
+    import re
+    from shutil import copyfile
+    
+    targets = {}
+    
+    for path, dirs, files in os.walk('.'):
+        for f in files:
+            fp = os.path.join(path, f)
+            if fp.endswith('.py'): continue
+            fp_size = os.stat(fp).st_size
+            if fp_size < 72 or fp_size > 256: continue
+            with open(fp, 'r', encoding='latin1') as stream:
+                l = stream.readline()
+                hashmatch = re.match('.*SHA256E\-\w+\-\-(\w{16})', l)
+                if hashmatch:
+                    targets[hashmatch.group(1)] = os.path.abspath(fp)
+    
+    #print(targets)
+    
+    target = os.path.abspath('.')
+    while not os.path.exists('.git/annex/objects'):
+        os.chdir('..')
+    
+    for path, dirs, files in os.walk('.git/annex/objects'):
+        for f in files:
+            fp = os.path.join(path, f)
+            fp_size = os.stat(fp).st_size
+            if fp_size > 512:
+                hashmatch = re.match('.*SHA256E\-\w+\-\-(\w{16})', fp)
+                if hashmatch:
+                    hash = hashmatch.group(1)
+                    if hash in targets:
+                        print(fp, '->', targets[hash])
+                        copyfile(fp, targets[hash])
+
+"""]]
diff --git a/doc/install/OSX/comment_13_f4b39e2009274539d60b29711a4a2c8d._comment b/doc/install/OSX/comment_13_f4b39e2009274539d60b29711a4a2c8d._comment
new file mode 100644
index 000000000..960591bc4
--- /dev/null
+++ b/doc/install/OSX/comment_13_f4b39e2009274539d60b29711a4a2c8d._comment
@@ -0,0 +1,22 @@
+[[!comment format=mdwn
+ username="lhunath@3b4ff15f4600f3276d1776a490b734fca0f5c245"
+ nickname="lhunath"
+ subject="The application cannot be opened because its executable is missing."
+ date="2016-05-05T04:33:06Z"
+ content="""
+Just downloaded the DMG, copied the .app into /Applications and ran it; does nothing, from terminal:
+
+$ open -W /Applications/git-annex.app
+The application cannot be opened because its executable is missing.
+
+$ /Applications/git-annex.app/Contents/MacOS/git-annex-webapp
+$
+unable to start webapp in repository /Users/lhunath/annex: Not in a git repository.
+Launching web browser on file:///var/folders/np/v9byg9092bbf31jw5cydzszm0000gn/T/webapp1622650073984943658.html
+
+$ /Applications/git-annex.app/Contents/MacOS/git-annex version
+git-annex version: 6.20160427-gd0036b9
+build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV FsEvents XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi
+key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL
+remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+"""]]