summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2010-12-15 10:17:57 -0800
committerShawn O. Pearce <spearce@spearce.org>2010-12-15 10:18:03 -0800
commit86847ee3224ac93da478bc5cdb8a79140ee6edac (patch)
tree381462a930fdcdaa3ab8d1aa697de8c737c86ed0
parent8efbd378e1eaa473d850efe77026abf51041d2f1 (diff)
downloadjgit-86847ee3224ac93da478bc5cdb8a79140ee6edac.tar.gz
jgit-86847ee3224ac93da478bc5cdb8a79140ee6edac.zip
Support GIT_SSH=tortoiseplink
The tortoiseplink command does not understand -batch, even though it smells like the putty plink command that does use it. Don't add -batch if GIT_SSH is tortoiseplink. Change-Id: I638532a02faa2caf8c39d482094e7ff4f4ec7e78 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java
index bb791ed439..e6609e6719 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java
@@ -308,7 +308,7 @@ public class TransportGitSsh extends SshTransport implements PackTransport {
List<String> args = new ArrayList<String>();
args.add(ssh);
- if (putty)
+ if (putty && !ssh.toLowerCase().contains("tortoiseplink"))
args.add("-batch");
if (0 < getURI().getPort()) {
args.add(putty ? "-P" : "-p");