@@ -5,7 +5,6 @@ use crate::bors::event::PullRequestEdited;
5
5
use crate :: bors:: handlers:: labels:: handle_label_trigger;
6
6
use crate :: bors:: Comment ;
7
7
use crate :: bors:: RepositoryState ;
8
- use crate :: github:: CommitSha ;
9
8
use crate :: github:: GithubUser ;
10
9
use crate :: github:: LabelTrigger ;
11
10
use crate :: github:: PullRequest ;
@@ -75,7 +74,7 @@ pub(super) async fn handle_pull_request_edited(
75
74
let pr_number = payload. pull_request . number ;
76
75
db. unapprove ( repo_state. repository ( ) , pr_number) . await ?;
77
76
handle_label_trigger ( & repo_state, pr_number, LabelTrigger :: Unapproved ) . await ?;
78
- notify_of_edited_pr ( & repo_state, pr_number, payload. pull_request . head . sha ) . await
77
+ notify_of_edited_pr ( & repo_state, pr_number, & payload. pull_request . base . name ) . await
79
78
}
80
79
81
80
fn sufficient_approve_permission ( repo : Arc < RepositoryState > , author : & GithubUser ) -> bool {
@@ -164,15 +163,15 @@ async fn notify_of_unapproval(repo: &RepositoryState, pr: &PullRequest) -> anyho
164
163
async fn notify_of_edited_pr (
165
164
repo : & RepositoryState ,
166
165
pr_number : PullRequestNumber ,
167
- head_sha : CommitSha ,
166
+ base_name : & str ,
168
167
) -> anyhow:: Result < ( ) > {
169
168
repo. client
170
169
. post_comment (
171
170
pr_number,
172
171
Comment :: new ( format ! (
173
172
r#":warning: The base branch changed to `{}`, and the
174
173
PR will need to be re-approved."# ,
175
- head_sha
174
+ base_name
176
175
) ) ,
177
176
)
178
177
. await
@@ -339,11 +338,8 @@ approve = ["+approved"]
339
338
340
339
assert_eq ! (
341
340
tester. get_comment( ) . await ?,
342
- format!(
343
- r#":warning: The base branch changed to `pr-{}-sha`, and the
341
+ r#":warning: The base branch changed to `main`, and the
344
342
PR will need to be re-approved."# ,
345
- default_pr_number( )
346
- )
347
343
) ;
348
344
check_pr_unapproved ( & tester, default_pr_number ( ) . into ( ) ) . await ;
349
345
Ok ( tester)
0 commit comments