fix(git-transport): Place port for PuTTY and derivates in separate argument

All three PuTTY clients require the port to be separated from the "-P" argument

kas committed 3 years ago

Commit 85c33821 parent b702c292 files · +4 −3Browse files

Unified · Split

2 files

git-transport/src/client/blocking_io/ssh/program_kind.rs +2 −1
git-transport/src/client/blocking_io/ssh/tests.rs +2 −2

git-transport/src/client/blocking_io/ssh/program_kind.rs+2−1

@@ -49,7 +49,8 @@ impl ProgramKind { · 48 unmodified lines
49	49	prepare = prepare.arg("-batch");
50	50	}
51	51	if let Some(port) = url.port {
52		− prepare = prepare.arg(format!("-P{}", port));
	52	+ prepare = prepare.arg("-P");
	53	+ prepare = prepare.arg(port.to_string());
53	54	}
54	55	}
55	56	ProgramKind::Simple => {

git-transport/src/client/blocking_io/ssh/tests.rs+2−2

@@ -134,14 +134,14 @@ mod program_kind { · 133 unmodified lines
134	134	fn tortoise_plink_has_batch_command() {
135	135	assert_eq!(
136	136	call_args(ProgramKind::TortoisePlink, "ssh://user@host:42/p", Protocol::V2),
137		− quoted(&["tortoiseplink.exe", "-batch", "-P42", "user@host"])
	137	+ quoted(&["tortoiseplink.exe", "-batch", "-P", "42", "user@host"])
138	138	);
139	139	}
140	140
141	141	#[test]
142	142	fn port_for_all() {
143	143	for kind in [ProgramKind::TortoisePlink, ProgramKind::Plink, ProgramKind::Putty] {
144		− assert!(call_args(kind, "ssh://user@host:43/p", Protocol::V2).ends_with(r#""-P43" "user@host""#));
	144	+ assert!(call_args(kind, "ssh://user@host:43/p", Protocol::V2).ends_with(r#""-P" "43" "user@host""#));
145	145	}
146	146	}
147	147