diff options
| author | binarycat <binarycat@envs.net> | 2024-09-08 16:57:22 -0400 |
|---|---|---|
| committer | binarycat <binarycat@envs.net> | 2024-09-08 18:37:01 -0400 |
| commit | 5a9b9a385f3ab90d225ae82b735ba92280d73b6d (patch) | |
| tree | fca3cb21429566f8a8088fc98b1139c41c51abb9 /src/bootstrap | |
| parent | adf8d168af9334a8bf940824fcf4207d01e05ae5 (diff) | |
| download | rust-5a9b9a385f3ab90d225ae82b735ba92280d73b6d.tar.gz rust-5a9b9a385f3ab90d225ae82b735ba92280d73b6d.zip | |
bootstrap: handle worktrees in warn_old_master_branch
fixes #130111
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/core/sanity.rs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs index dbc712adadf..10f7c2e1364 100644 --- a/src/bootstrap/src/core/sanity.rs +++ b/src/bootstrap/src/core/sanity.rs @@ -378,13 +378,5 @@ $ pacman -R cmake && pacman -S mingw-w64-x86_64-cmake cmd_finder.must_have(s); } - // this warning is useless in CI, - // and CI probably won't have the right branches anyway. - if !build_helper::ci::CiEnv::is_ci() { - if let Err(e) = warn_old_master_branch(&build.config.git_config(), &build.config.src) - .map_err(|e| e.to_string()) - { - eprintln!("unable to check if upstream branch is old: {e}"); - } - } + warn_old_master_branch(&build.config.git_config(), &build.config.src); } |