File tree Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -219,10 +219,18 @@ async fn branch_for_rollup(
219
219
. await
220
220
. context ( "got rollup merge" ) ?;
221
221
222
- let old_master_commit =
223
- get_commit ( & client, & data, repository_url, & rollup_merge. parents [ 0 ] . sha )
222
+ let mut current = rollup_merge. clone ( ) ;
223
+ loop {
224
+ log:: trace!( "searching for auto branch, at {:?}" , current. sha) ;
225
+ if current. commit . message . starts_with ( "Auto merge" ) {
226
+ break ;
227
+ }
228
+ assert_eq ! ( current. parents. len( ) , 2 ) ;
229
+ current = get_commit ( & client, & data, repository_url, & current. parents [ 0 ] . sha )
224
230
. await
225
231
. context ( "success master get" ) ?;
232
+ }
233
+ let old_master_commit = current;
226
234
227
235
let current_master_commit = get_commit ( & client, & data, repository_url, "master" )
228
236
. await
You can’t perform that action at this time.
0 commit comments