Merge pull request #91 from wannessels/master

[FIXED JENKINS-21030]
jenkinsci · Jan 31, 2014 · fe2623a · fe2623a
2 parents 2a1749a + 602d905
commit fe2623a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
@@ -1043,6 +1043,10 @@ private File createWindowsGitSSH(File key) throws IOException {
           // try the (x86) version for 64-bit Windows builds
           sshexe = new File(progFiles + " (x86)" + sshPath);
         }
+        if (!sshexe.exists()) {
+		  // try the ssh.exe next to known git.exe
+		  sshexe = new File(new File(gitExe).getParentFile(), "ssh.exe");
+        }
 
         if (!sshexe.exists()) {
             throw new RuntimeException("git plugin only support official git client http://git-scm.com/download/win");