mirror
/
rustc-dev-guide
mirror of https://github.com/rust-lang/rustc-dev-guide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Print an explicit message if the base repo head commit is up-to-date

This commit is contained in:
Jakub Beránek 2025-01-08 15:26:14 +01:00
parent 7d59cb33f6
commit c92957d38a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
josh-sync/src/sync.rs
View File

@ -45,6 +45,11 @@ impl GitSync {
let josh_url = let josh_url =
format!("http://localhost:{JOSH_PORT}/{UPSTREAM_REPO}.git@{commit}{JOSH_FILTER}.git"); format!("http://localhost:{JOSH_PORT}/{UPSTREAM_REPO}.git@{commit}{JOSH_FILTER}.git");
let previous_base_commit = sh.read_file("rust-version")?.trim().to_string();
if previous_base_commit == commit {
return Err(anyhow::anyhow!("No changes since last pull"));
}
// Update rust-version file. As a separate commit, since making it part of // Update rust-version file. As a separate commit, since making it part of
// the merge has confused the heck out of josh in the past. // the merge has confused the heck out of josh in the past.
// We pass `--no-verify` to avoid running git hooks. // We pass `--no-verify` to avoid running git hooks.