diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2025-01-08 15:26:14 +0100 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2025-01-08 17:52:01 +0100 |
| commit | 7e2a690889a160bb7bba4d3a0664f37da0185780 (patch) | |
| tree | c5558b2ee96e63bfa7e4a854f5ef83231e1db04b /src/doc/rustc-dev-guide | |
| parent | 5a11197efd883b72492f69efc115fdd464d63bcb (diff) | |
| download | rust-7e2a690889a160bb7bba4d3a0664f37da0185780.tar.gz rust-7e2a690889a160bb7bba4d3a0664f37da0185780.zip | |
Print an explicit message if the base repo head commit is up-to-date
Diffstat (limited to 'src/doc/rustc-dev-guide')
| -rw-r--r-- | src/doc/rustc-dev-guide/josh-sync/src/sync.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/doc/rustc-dev-guide/josh-sync/src/sync.rs b/src/doc/rustc-dev-guide/josh-sync/src/sync.rs index da21a4c9a27..1c1757a46f9 100644 --- a/src/doc/rustc-dev-guide/josh-sync/src/sync.rs +++ b/src/doc/rustc-dev-guide/josh-sync/src/sync.rs @@ -45,6 +45,11 @@ impl GitSync { let josh_url = 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 // the merge has confused the heck out of josh in the past. // We pass `--no-verify` to avoid running git hooks. |