diff options
| author | Jacob Pratt <jacob@jhpratt.dev> | 2025-01-11 01:55:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-11 01:55:06 -0500 |
| commit | 8c3e9d7c628b156e92dd0a4bad92cdf3adf43db9 (patch) | |
| tree | 37f647daaf776b87a658bf69cc007f42297da086 | |
| parent | 351e6188a8ce92dfc9509712dd1cd11d8e5805b9 (diff) | |
| parent | 60cbd749f3cfb2c717a32788bca010b441818bae (diff) | |
| download | rust-8c3e9d7c628b156e92dd0a4bad92cdf3adf43db9.tar.gz rust-8c3e9d7c628b156e92dd0a4bad92cdf3adf43db9.zip | |
Rollup merge of #135301 - lolbinarycat:bootstrap-old-master-resurected, r=onur-ozkan
re-add a warning for old master branch, but with much simpler logic instead of calling into git or checking the modification time of files, simply print the warning if there is a very large number of "modified" files. also make the wording much softer, so false positives are less alarming. (warning was removed in https://github.com/rust-lang/rust/issues/134935)
| -rw-r--r-- | src/bootstrap/src/core/build_steps/format.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bootstrap/src/core/build_steps/format.rs b/src/bootstrap/src/core/build_steps/format.rs index f15e0f38e69..590da1fb514 100644 --- a/src/bootstrap/src/core/build_steps/format.rs +++ b/src/bootstrap/src/core/build_steps/format.rs @@ -114,6 +114,9 @@ fn print_paths(verb: &str, adjective: Option<&str>, paths: &[String]) { } else { println!("fmt: {verb} {len} {adjective}files"); } + if len > 1000 && !CiEnv::is_ci() { + println!("hint: if this number seems too high, try running `git fetch origin master"); + } } pub fn format(build: &Builder<'_>, check: bool, all: bool, paths: &[PathBuf]) { |