Skip to content

Commit

Permalink
warn the user if the upstream branch has is old
Browse files Browse the repository at this point in the history
  • Loading branch information
lolbinarycat committed Aug 25, 2024
1 parent a60a9e5 commit badda06
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/bootstrap/src/core/build_steps/format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::sync::mpsc::SyncSender;
use std::sync::Mutex;

use build_helper::ci::CiEnv;
use build_helper::git::get_git_modified_files;
use build_helper::git::{get_git_modified_files, warn_old_master_branch};
use ignore::WalkBuilder;

use crate::core::builder::Builder;
Expand Down Expand Up @@ -93,7 +93,8 @@ fn get_modified_rs_files(build: &Builder<'_>) -> Result<Option<Vec<String>>, Str
if !verify_rustfmt_version(build) {
return Ok(None);
}

warn_old_master_branch(&build.config.git_config(), &build.config.src)
.map_err(|e| e.to_string())?;
get_git_modified_files(&build.config.git_config(), Some(&build.config.src), &["rs"])
}

Expand Down

0 comments on commit badda06

Please sign in to comment.