summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <id@joeyh.name>2014-12-03 13:39:54 -0400
committerGravatar Joey Hess <id@joeyh.name>2014-12-03 13:39:54 -0400
commit6ee2216421f61a488056d211dca9895fb5d114de (patch)
tree7c76302bbc9c6468e319ec8bfc0813118c86b78e
parent1d956fc3620a77aa5acc487744c02489a9d3b0b6 (diff)
parent5f5032891c1f1c667b079e457e355eff54fe4c77 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/bugs/Internal_server_error_while_adding_remote_server_on_Windows/comment_3_0ff9b2e15904ef64b7d1937a41da5f49._comment7
-rw-r--r--doc/bugs/Uninstalling_removes_libcrypto.dll/comment_4_8d36cf821c62207df0a3b1fda5758fae._comment9
2 files changed, 16 insertions, 0 deletions
diff --git a/doc/bugs/Internal_server_error_while_adding_remote_server_on_Windows/comment_3_0ff9b2e15904ef64b7d1937a41da5f49._comment b/doc/bugs/Internal_server_error_while_adding_remote_server_on_Windows/comment_3_0ff9b2e15904ef64b7d1937a41da5f49._comment
new file mode 100644
index 000000000..5144abcc6
--- /dev/null
+++ b/doc/bugs/Internal_server_error_while_adding_remote_server_on_Windows/comment_3_0ff9b2e15904ef64b7d1937a41da5f49._comment
@@ -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.
+"""]]
diff --git a/doc/bugs/Uninstalling_removes_libcrypto.dll/comment_4_8d36cf821c62207df0a3b1fda5758fae._comment b/doc/bugs/Uninstalling_removes_libcrypto.dll/comment_4_8d36cf821c62207df0a3b1fda5758fae._comment
new file mode 100644
index 000000000..c048d7e54
--- /dev/null
+++ b/doc/bugs/Uninstalling_removes_libcrypto.dll/comment_4_8d36cf821c62207df0a3b1fda5758fae._comment
@@ -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]]
+"""]]