Fast-forward instead of force push to base branch

Author: Sakib25800

src/bors/handlers/trybuild.rs

@@ -146,7 +146,7 @@ async fn attempt_merge(
 
     // First set the try branch to our base commit (either the selected parent or the main branch).
     client
-        .set_branch_to_sha(TRY_MERGE_BRANCH_NAME, base_sha)
+        .set_branch_to_sha(TRY_MERGE_BRANCH_NAME, base_sha, true)
         .await
         .map_err(|error| anyhow!("Cannot set try merge branch to {}: {error:?}", base_sha.0))?;
 
@@ -177,7 +177,7 @@ async fn run_try_build(
     parent_sha: CommitSha,
 ) -> anyhow::Result<()> {
     client
-        .set_branch_to_sha(TRY_BRANCH_NAME, &commit_sha)
+        .set_branch_to_sha(TRY_BRANCH_NAME, &commit_sha, true)
         .await
         .map_err(|error| anyhow!("Cannot set try branch to main branch: {error:?}"))?;
 

src/bors/merge_queue.rs

@@ -70,7 +70,7 @@ pub async fn handle_merge_queue(ctx: Arc<BorsContext>) -> anyhow::Result<()> {
                     BuildStatus::Success => {
                         match repo
                             .client
-                            .set_branch_to_sha(&pr.base_branch, &commit_sha)
+                            .set_branch_to_sha(&pr.base_branch, &commit_sha, false)
                             .await
                         {
                             Ok(()) => {
@@ -197,7 +197,7 @@ async fn start_auto_build(
         MergeResult::Success(merge_sha) => {
             // 2. Push merge commit to `AUTO_BRANCH_NAME` where CI runs
             client
-                .set_branch_to_sha(AUTO_BRANCH_NAME, &merge_sha)
+                .set_branch_to_sha(AUTO_BRANCH_NAME, &merge_sha, true)
                 .await?;
 
             // 3. Record the build in the database
@@ -276,7 +276,7 @@ async fn attempt_merge(
 
     // Reset auto merge branch to point to base branch
     client
-        .set_branch_to_sha(AUTO_MERGE_BRANCH_NAME, base_sha)
+        .set_branch_to_sha(AUTO_MERGE_BRANCH_NAME, base_sha, true)
         .await
         .map_err(|error| anyhow!("Cannot set auto merge branch to {}: {error:?}", base_sha.0))?;
 

src/github/api/client.rs

@@ -139,9 +139,14 @@ impl GithubRepositoryClient {
     }
 
     /// Set the given branch to a commit with the given `sha`.
-    pub async fn set_branch_to_sha(&self, branch: &str, sha: &CommitSha) -> anyhow::Result<()> {
+    pub async fn set_branch_to_sha(
+        &self,
+        branch: &str,
+        sha: &CommitSha,
+        force: bool,
+    ) -> anyhow::Result<()> {
         perform_network_request_with_retry("set_branch_to_sha", || async {
-            Ok(set_branch_to_commit(self, branch.to_string(), sha).await?)
+            Ok(set_branch_to_commit(self, branch.to_string(), sha, force).await?)
         })
         .await?
     }

src/github/api/operations.rs

@@ -88,15 +88,16 @@ pub async fn merge_branches(
     }
 }
 
-/// Forcefully updates the branch to the given commit `sha`.
+/// Updates the branch to the given commit `sha`.
 /// If the branch does not exist yet, it instead attempts to create it.
 pub async fn set_branch_to_commit(
     repo: &GithubRepositoryClient,
     branch_name: String,
     sha: &CommitSha,
+    force: bool,
 ) -> Result<(), BranchUpdateError> {
     // Fast-path: assume that the branch exists
-    match update_branch(repo, branch_name.clone(), sha).await {
+    match update_branch(repo, branch_name.clone(), sha, force).await {
         Ok(_) => Ok(()),
         Err(BranchUpdateError::BranchNotFound(_)) => {
             // Branch does not exist yet, try to create it
@@ -132,11 +133,12 @@ pub enum BranchUpdateError {
     Custom(String),
 }
 
-/// Force update the branch with the given `branch_name` to the given `sha`.
+/// Update the branch with the given `branch_name` to the given `sha`.
 async fn update_branch(
     repo: &GithubRepositoryClient,
     branch_name: String,
     sha: &CommitSha,
+    force: bool,
 ) -> Result<(), BranchUpdateError> {
     let url = format!(
         "/repos/{}/git/refs/{}",
@@ -152,7 +154,7 @@ async fn update_branch(
             url.as_str(),
             Some(&serde_json::json!({
                 "sha": sha.as_ref(),
-                "force": true
+                "force": force
             })),
         )
         .await?;