summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-04-07 11:35:20 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-04-07 11:35:27 -0400
commit9cbe5068f837d71dbcfd884d5ebfcb105600a85d (patch)
tree167098f49a5d6e088c2612173300568aab88fd44 /CHANGELOG
parent44bd2dedc7819a37bb3ad663be276528b39feb8d (diff)
Disable git-annex's support for GIT_SSH and GIT_SSH_COMMAND, unless GIT_ANNEX_USE_GIT_SSH=1 is also set in the environment.
This is necessary because as feared, the extra -n parameter that git-annex passes breaks uses of these environment variables that expect exactly the parameters that git passes. For example, see https://github.com/datalad/datalad/issues/1456 It would of course be possible to pre-close stdin before running ssh so not needing the -n, and I think that would not even break ssh's password caching. But it would probably involve a lot of work, possibly would need to deal with some layering violations, and would be error-prone. The really clean fix would be to make all the ssh stuff return a CreateProcess, which could have the handle closed when appropriate, but that would be a large reworing of the code base. This commit was supported by the NSF-funded DataLad project.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0a9e56f1b..f36445549 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,11 @@ git-annex (6.20170322) UNRELEASED; urgency=medium
* Added remote.<name>.annex-push and remote.<name>.annex-pull
which can be useful to make remotes that don't get fully synced with
local changes.
+ * Disable git-annex's support for GIT_SSH and GIT_SSH_COMMAND, unless
+ GIT_ANNEX_USE_GIT_SSH=1 is also set in the environment. This is
+ necessary because as feared, the extra -n parameter that git-annex
+ passes breaks uses of these environment variables that expect exactly
+ the parameters that git passes.
-- Joey Hess <id@joeyh.name> Wed, 29 Mar 2017 12:41:46 -0400