From 3286bebf998700d79ab766472cebfcc4399c8894 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 17 Mar 2017 16:02:47 -0400 Subject: Support GIT_SSH and GIT_SSH_COMMAND They are handled close the same as they are by git. However, unlike git, git-annex sometimes needs to pass the -n parameter when using these. So, this has the potential for breaking some setup, and perhaps there ought to be a ANNEX_USE_GIT_SSH=1 needed to use these. But I'd rather avoid that if possible, so let's see if anyone complains. Almost all places where "ssh" was run have been changed to support the env vars. Anything still calling sshOptions does not support them. In particular, rsync special remotes don't. Seems that annex-rsync-transport already gives sufficient control there. (Fixed in passing: Remote.Helper.Ssh.toRepo used to extract remoteAnnexSshOptions and pass them to sshOptions, which was redundant since sshOptions also extracts those.) This commit was sponsored by Jeff Goeke-Smith on Patreon. --- git-annex.cabal | 1 + 1 file changed, 1 insertion(+) (limited to 'git-annex.cabal') diff --git a/git-annex.cabal b/git-annex.cabal index bf36afa3a..4cf17b770 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -833,6 +833,7 @@ Executable git-annex Git.Remote.Remove Git.Repair Git.Sha + Git.Ssh Git.Status Git.Tree Git.Types -- cgit v1.2.3