diff options
author | Joey Hess <joeyh@joeyh.name> | 2017-03-17 12:33:52 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2017-03-17 12:33:52 -0400 |
commit | acc7effc35e2552809df830c4a8213771168c724 (patch) | |
tree | d77267de079d769621096234197e3e4398bb4f32 | |
parent | d345e7220e33a744765ed6f5caf8be5014712671 (diff) | |
parent | 736f5fc64481fbefd0f1ccad47a0f8f758544fb8 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r-- | doc/bugs/cannot___40__or_how__63____41___to_pass_socket_path_with_a_space_in_its_path_via_annex-ssh-options.mdwn | 31 | ||||
-rw-r--r-- | doc/users/datalad.mdwn | 8 |
2 files changed, 35 insertions, 4 deletions
diff --git a/doc/bugs/cannot___40__or_how__63____41___to_pass_socket_path_with_a_space_in_its_path_via_annex-ssh-options.mdwn b/doc/bugs/cannot___40__or_how__63____41___to_pass_socket_path_with_a_space_in_its_path_via_annex-ssh-options.mdwn new file mode 100644 index 000000000..cc0eed824 --- /dev/null +++ b/doc/bugs/cannot___40__or_how__63____41___to_pass_socket_path_with_a_space_in_its_path_via_annex-ssh-options.mdwn @@ -0,0 +1,31 @@ +### Please describe the problem. + +git annex specifies its own socket path via -S. To overload with our socket path (to be reused by annex and other ssh invocations) we need to provide the path via annex-ssh-options option. And we cannot pass it as an overload -o ControlPath since -S specification provided by annex "overrides" it. +The difficulty comes in possibly not quite common but still possible case when path to the socket contains a space. I have tried all kinds of possible specifications but failed to find one which works... + +Could you give me a hint!? ;) + +### What version of git-annex are you using? On what operating system? + +6.20170307+gitg24ade8a25-1~ndall+1 + +### Please provide any additional information below. + +[[!format sh """ +# so -- ssh works +$> ssh -O check -oControlMaster=auto -S"/tmp/te st/socket" 'yohtest@smaug' +Master running (pid=20336) +# but can't get annex to use it: + +$> git annex init -c 'remote.origin.annex-ssh-options=-oControlMaster=auto -S"/tmp/te st/socket"' +init ssh: Could not resolve hostname st/socket": Name or service not known +yohtest@smaug's password: + +$> git annex init -c 'remote.origin.annex-ssh-options=-oControlMaster=auto "-S\"/tmp/te st/socket\""' +init ssh: Could not resolve hostname "-s\\"/tmp/te: Name or service not known +yohtest@smaug's password: + +# etc +"""]] + +[[!meta author=yoh]] diff --git a/doc/users/datalad.mdwn b/doc/users/datalad.mdwn index 1aad07cf6..7726af06d 100644 --- a/doc/users/datalad.mdwn +++ b/doc/users/datalad.mdwn @@ -2,22 +2,22 @@ TODOs for DataLad ================= [[!inline pages="todo/* and !todo/done and !link(todo/done) and -(author(yoh) or author(mih))" sort=mtime feeds=no actions=yes archive=yes show=0]] +(author(yoh) or author(mih) or author(ben))" sort=mtime feeds=no actions=yes archive=yes show=0]] Done ---- [[!inline pages="todo/* and !todo/done and link(todo/done) and -(author(yoh) or author(mih))" feeds=no actions=yes archive=yes show=0]] +(author(yoh) or author(mih) or author(ben))" feeds=no actions=yes archive=yes show=0]] My bugs ======= [[!inline pages="bugs/* and !bugs/done and !link(bugs/done) and -(author(yoh) or author(mih))" sort=mtime feeds=no actions=yes archive=yes show=0 template=buglist]] +(author(yoh) or author(mih) or author(ben))" sort=mtime feeds=no actions=yes archive=yes show=0 template=buglist]] Fixed ----- [[!inline pages="bugs/* and !bugs/done and link(bugs/done) and -(author(yoh) or author(mih))" feeds=no actions=yes archive=yes show=0 template=buglist]] +(author(yoh) or author(mih) or author(ben))" feeds=no actions=yes archive=yes show=0 template=buglist]] |