bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #106310 - compiler-errors:old-git, r=jyn514

Browse source 
Dont use `--merge-base` during bootstrap formatting subcommand

I use a development image with Ubuntu 20.04 LTS, which has git 2.25.

Recently, `./x.py test tidy --bless` regressed in #105702 because it uses the `--merge-base` option on `diff-index`, which was only introduced in git 2.30 (git/git@0f5a1d449b). Luckily, it can be replicated via two calls to `git merge-base` + `git diff-index`, so let's just use that.
This commit is contained in:
Michael Goulet 2022-12-30 21:26:36 -08:00 • committed by GitHub
commit 96e32a49c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/bootstrap/format.rs
View file

@ -79,24 +79,19 @@ fn update_rustfmt_version(build: &Builder<'_>) {
/// ///
/// Returns `None` if all files should be formatted. /// Returns `None` if all files should be formatted.
fn get_modified_rs_files(build: &Builder<'_>) -> Option<Vec<String>> { fn get_modified_rs_files(build: &Builder<'_>) -> Option<Vec<String>> {
let Ok(remote) = get_rust_lang_rust_remote() else {return None;}; let Ok(remote) = get_rust_lang_rust_remote() else { return None; };
if !verify_rustfmt_version(build) { if !verify_rustfmt_version(build) {
return None; return None;
} }
let merge_base =
output(build.config.git().arg("merge-base").arg(&format!("{remote}/master")).arg("HEAD"));
Some( Some(
output( output(build.config.git().arg("diff-index").arg("--name-only").arg(merge_base.trim()))
build .lines()
.config .map(|s| s.trim().to_owned())
.git() .filter(|f| Path::new(f).extension().map_or(false, |ext| ext == "rs"))
.arg("diff-index") .collect(),
.arg("--name-only")
.arg("--merge-base")
.arg(&format!("{remote}/master")),
)
.lines()
.map(|s| s.trim().to_owned())
.filter(|f| Path::new(f).extension().map_or(false, |ext| ext == "rs"))
.collect(),
) )
} }