--- OLD/connect.c	Thu Jan  1 00:00:00 1970
+++ NEW/connect.c	Thu Jan  1 00:00:00 1970
@@ -608,15 +608,21 @@
 	conn->argv = arg = xcalloc(7, sizeof(*arg));
 	if (protocol == PROTO_SSH) {
 		const char *ssh = getenv("GIT_SSH");
-		int putty = ssh && strcasestr(ssh, "plink");
+// what a gross test.  Consider a host named, for example, "dsplink".
+//		int putty = ssh && strcasestr(ssh, "plink");
 		if (!ssh) ssh = "ssh";
 
 		*arg++ = ssh;
-		if (putty && !strcasestr(ssh, "tortoiseplink"))
-			*arg++ = "-batch";
+// WTF?  "tortoiseplink"??
+//		if (putty && !strcasestr(ssh, "tortoiseplink"))
+//			*arg++ = "-batch";
 		if (port) {
-			/* P is for PuTTY, p is for OpenSSH */
-			*arg++ = putty ? "-P" : "-p";
+//			/* P is for PuTTY, p is for OpenSSH */
+//			*arg++ = putty ? "-P" : "-p";
+// ugh, but if they're going to blindly assume things about the ssh
+// implementation, I have little compunction about blindly assuming
+// things about the ssh implementation I'm _actually_ using. :-þ
+			*arg++ = "-port";
 			*arg++ = port;
 		}
 		*arg++ = host;