Skip to content

fix(git): convert SCP-like submodule URLs to ssh:// format #16727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weihanglo merged 2 commits into from
Mar 12, 2026
+91 −10
Merged

fix(git): convert SCP-like submodule URLs to ssh:// format #16727

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e73307
test(git): Add test to fetch SCP-like submodule
cibil47 Mar 11, 2026
dbb2b56
fix(git): convert SCP-like submodule URLs to ssh:// format
cibil47 Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
test(git): Add test to fetch SCP-like submodule 
Signed-off-by: Cibil Pankiras <cibil.pankiras@egym.com>
  • Loading branch information
@cibil47
cibil47 committed Mar 11, 2026
commit 3e73307074b4a9190c9afa5b55daad525e1e299a
69 changes: 69 additions & 0 deletions tests/testsuite/git.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4379,3 +4379,72 @@ fn dep_with_cached_submodule() {
.collect::<Vec<_>>();
assert_eq!(db_paths.len(), 1, "submodule db created once");
}

#[cargo_test]
fn dep_with_scp_like_submodule_url() {
// Regression test for https://github.com/rust-lang/cargo/pull/16727
let git_project = git::new("dep1", |project| {
project
.file("Cargo.toml", &basic_manifest("dep1", "0.5.0"))
.file("src/lib.rs", "pub fn dep() {}")
});
let git_project2 = git::new("dep2", |project| project.file("lib.rs", "pub fn dep2() {}"));

let repo = git2::Repository::open(&git_project.root()).unwrap();
let url = git_project2.root().to_url().to_string();
git::add_submodule(&repo, &url, Path::new("submod"));
git::commit(&repo);

git_project.change_file(
".gitmodules",
"[submodule \"submod\"]\n\tpath = submod\n\turl = git@github.com:foo/bar.git",
);
git::add(&repo);
git::commit(&repo);

let p = project()
.file(
"Cargo.toml",
&format!(
r#"
[package]
name = "foo"
version = "0.5.0"
edition = "2015"

[dependencies.dep1]
git = '{}'
"#,
git_project.url()
),
)
.file("src/lib.rs", "extern crate dep1;")
.build();

// since Cargo can't parse SCP-like URL, it will fail earlier with invalid
// URL error before reaching the non-existing SSH server.
p.cargo("fetch")
.env(
"GIT_SSH_COMMAND",
"ssh -o StrictHostKeyChecking=no -o LogLevel=ERROR",
)
.with_status(101)
.with_stderr_data(str![[r#"
[UPDATING] git repository `[ROOTURL]/dep1`
[ERROR] failed to get `dep1` as a dependency of package `foo v0.5.0 ([ROOT]/foo)`

Caused by:
failed to load source for dependency `dep1`

Caused by:
unable to update [ROOTURL]/dep1

Caused by:
failed to update submodule `submod`

Caused by:
invalid url `git@github.com:foo/bar.git`: relative URL without a base; try using `ssh://git@github.com/foo/bar.git` instead

"#]])
.run();
}