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

This commit is contained in:
Joey Hess 2014-12-03 13:39:54 -04:00
commit 853c65161c
2 changed files with 16 additions and 0 deletions

View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="http://joeyh.name/"
subject="comment 3"
date="2014-12-03T17:35:19Z"
content="""
I was able to reproduce this. ssh is installed in C:\Program Files\Git\bin\, which is not in the PATH unless the msysgit installer is told to put all the unix utils in the PATH.
"""]]

View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="http://joeyh.name/"
subject="comment 4"
date="2014-12-03T17:36:58Z"
content="""
Except it turns out that Git/bin is not in PATH by default.
So, instead, git-annex will bundle ssh, but install it to Git/cmd, which is in PATH. This avoids the conflict and fixed [[bugs/Internal_server_error_while_adding_remote_server_on_Windows]]
"""]]