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

4 files changed, 70 insertions, 0 deletions

diff --git a/doc/bugs/get_-J_from_ssh_remote_tries_to_lock_in_home_directory__63__.mdwn b/doc/bugs/get_-J_from_ssh_remote_tries_to_lock_in_home_directory__63__.mdwn
new file mode 100644
index 000000000..77b2b1ccf
--- /dev/null
+++ b/doc/bugs/get_-J_from_ssh_remote_tries_to_lock_in_home_directory__63__.mdwn
@@ -0,0 +1,49 @@
+### Please describe the problem.
+
+had `datalad get -J4` lockup ... interrupted it, ran git annex directly to observe some errors reported and what looks like to be an attempt to determine if the home directory on remote end is a git repo... see below for details of such a run.  
+
+may be unrelated but also experiencing some lock ups [while "interacting" with this remote  from datalad](https://github.com/datalad/datalad/issues/2128)
+
+### What version of git-annex are you using? On what operating system?
+6.20180206+gitg638032f3a-1~ndall+1 on the local
+6.20180115-g56b56033a on remote
+
+### Please provide any additional information below.
+
+[[!format sh """
+$> 'git' '-c' 'receive.autogc=0' '-c' 'gc.auto=0' 'annex' 'get' '--debug' '-c' 'remote.rolando.annex-ssh-options=-o ControlMaster=auto -S /home/yoh/.cache/datalad/sockets/810d3ac4' '--json' '--json-progress' -J4  --from rolando --key SHA256E-s4295588--8db39d197775c7372bb1afff197ea724f158f3217ad064eef7ff8427a1502f15.tgz    
+fatal: Not a git repository: '../../../home/bids/.git'
+git-annex-shell: Not a git-annex or gcrypt repository.
+  Unable to run git-annex-shell on remote .
+{"byte-progress":4295588,"action":{"command":"get","note":"from rolando...","key":"SHA256E-s4295588--8db39d197775c7372bb1afff197ea724f158f3217ad064eef7ff8427a1502f15.tgz","file":null},"total-size":4295588,"percent-progress":"100%"}
+{"byte-progress":4295588,"action":{"command":"get","note":"from rolando...","key":"SHA256E-s4295588--8db39d197775c7372bb1afff197ea724f158f3217ad064eef7ff8427a1502f15.tgz","file":null},"total-size":4295588,"percent-progress":"100%"}
+{"command":"get","note":"checksum...","success":true,"key":"SHA256E-s4295588--8db39d197775c7372bb1afff197ea724f1  Unable to run git-annex-shell on remote .
+
+$> git annex drop 'sourcedata/sub-qa/ses-20180102'
+drop sourcedata/sub-qa/ses-20180102/anat/sub-qa_ses-20180102_scout.dicom.tgz (locking rolando...) ok
+(recording state in git...)
+
+$> 'git' '-c' 'receive.autogc=0' '-c' 'gc.auto=0' 'annex' 'get' '--debug' '-c' 'remote.rolando.annex-ssh-options=-o ControlMaster=auto -S /home/yoh/.cache/datalad/sockets/810d3ac4' '--json' '--json-progress' --from rolando --key SHA256E-s4295588--8db39d197775c7372bb1afff197ea724f158f3217ad064eef7ff8427a1502f15.tgz     
+{"byte-progress":4295588,"action":{"command":"get","note":"from rolando...","key":"SHA256E-s4295588--8db39d197775c7372bb1afff197ea724f158f3217ad064eef7ff8427a1502f15.tgz","file":null},"total-size":4295588,"percent-progress":"100%"}
+{"byte-progress":4295588,"action":{"command":"get","note":"from rolando...","key":"SHA256E-s4295588--8db39d197775c7372bb1afff197ea724f158f3217ad064eef7ff8427a1502f15.tgz","file":null},"total-size":4295588,"percent-progress":"100%"}
+{"command":"get","note":"checksum...","success":true,"key":"SHA256E-s4295588--8db39d197775c7372bb1afff197ea724f158f3217ad064eef7ff8427a1502f15.tgz","file":null}
+
+$> cat .git/config
+ ...
+[remote "rolando"]
+	url = bids@rolando.cns.dartmouth.edu:/inbox/BIDS/dbic/QA
+	fetch = +refs/heads/*:refs/remotes/rolando/*
+	annex-uuid = 6384a551-a41d-4290-b186-9258befede97
+	annex-ignore = false
+
+"""]]
+
+To get to that host I have `ProxyCommand ssh -q -A smaug.dartmouth.edu 'nc -w1 %h %p'` in my ~/.ssh/config for it (if relevant)
+
+### 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)
+
+Most of the days of the week. Friday is a tricky one
+
+[[!meta author=yoh]]
+
+
diff --git a/doc/bugs/get_-J_from_ssh_remote_tries_to_lock_in_home_directory__63__/comment_1_362a858ce78fa0b8d7949fb39fb247d9._comment b/doc/bugs/get_-J_from_ssh_remote_tries_to_lock_in_home_directory__63__/comment_1_362a858ce78fa0b8d7949fb39fb247d9._comment
new file mode 100644
index 000000000..27f8f3fef
--- /dev/null
+++ b/doc/bugs/get_-J_from_ssh_remote_tries_to_lock_in_home_directory__63__/comment_1_362a858ce78fa0b8d7949fb39fb247d9._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="yarikoptic"
+ avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
+ subject="comment 1"
+ date="2018-02-10T02:48:14Z"
+ content="""
+BTW remote location is an NFS mount ... git annex didn't show any issue working with it on that host any time recently
+"""]]
diff --git a/doc/bugs/importfeed_does_not_work_with_socks_proxy.mdwn b/doc/bugs/importfeed_does_not_work_with_socks_proxy.mdwn
new file mode 100644
index 000000000..cee34367e
--- /dev/null
+++ b/doc/bugs/importfeed_does_not_work_with_socks_proxy.mdwn
@@ -0,0 +1,5 @@
+It appears that `git annex importfeed` can not be used in with socks proxies because it uses wget unconditionally (at least in the Debian build).
+
+For `addurl`, I could configure the system to use a socks proxy by setting `git config annex.web-download-command "curl --silent --preproxy socks4a://localhost:1080 %url -o %file"`; for `importfeed`, I found no option to override the command used to fetch the URL, and `wget` [lacks SOCKS support](https://savannah.gnu.org/bugs/?func=detailitem&item_id=43576).
+
+Please consider using `web-download-command` for `importfeed` too, introducing a dedicated option `web-get-command` (that would output to stdout rather than %file), or otherwise supporting operation behind a SOCKS proxy.
diff --git a/doc/forum/offsite_repo/comment_2_d4ecd0dc29597e3e0988e06ee9c4d245._comment b/doc/forum/offsite_repo/comment_2_d4ecd0dc29597e3e0988e06ee9c4d245._comment
new file mode 100644
index 000000000..bcbb5ae36
--- /dev/null
+++ b/doc/forum/offsite_repo/comment_2_d4ecd0dc29597e3e0988e06ee9c4d245._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="ericm"
+ avatar="http://cdn.libravatar.org/avatar/67ca64c5a99fb142fc2e3916333881ca"
+ subject="comment 2"
+ date="2018-02-11T08:59:07Z"
+ content="""
+Ok I think that will do. I'll give it a try when I get some time. Thanks!
+"""]]