ssh: Omit port option from ssh command unless specified in remote url

jayong93 · jayong93 · commit 35dccc30d748 · 2024-07-15T13:24:58.000+09:00
Omit `-p 22` option from ssh command by default.
Adding `-p 22` option when a port is not in a remote url causes that
`Port` option in a ssh config is ignored.
diff --git a/src/libgit2/transports/ssh_exec.c b/src/libgit2/transports/ssh_exec.c
@@ -131,6 +131,7 @@ static int get_ssh_cmdline(
 	git_str ssh_cmd = GIT_STR_INIT;
 	const char *default_ssh_cmd = "ssh";
 	int error;
+	git_str port_str = GIT_STR_INIT;
 
 	/*
 	 * Safety check: like git, we forbid paths that look like an
@@ -158,16 +159,20 @@ static int get_ssh_cmdline(
 	else if ((error = git_config__get_string_buf(&ssh_cmd, cfg, "core.sshcommand")) < 0 && error != GIT_ENOTFOUND)
 		goto done;
 
-	error = git_str_printf(out, "%s -p %s \"%s%s%s\" \"%s\" \"%s\"",
+	if (url->port_specified && (error = git_str_printf(&port_str, "-p %s", url->port)) < 0)
+		return error;
+
+	error = git_str_printf(out, "%s %s \"%s%s%s\" \"%s\" \"%s\"",
 		ssh_cmd.size > 0 ? ssh_cmd.ptr : default_ssh_cmd,
-		url->port,
+		port_str.ptr,
 		url->username ? url->username : "",
 		url->username ? "@" : "",
 		url->host,
 		command,
 		url->path);
 
 done:
+	git_str_dispose(&port_str);
 	git_str_dispose(&ssh_cmd);
 	git_config_free(cfg);
 	return error;
