Address small PR nits

Author: rylev

site/src/api.rs

@@ -413,7 +413,6 @@ pub mod github {
     pub struct Push {
         pub r#ref: String,
         pub sender: Sender,
-        pub committer: Committer,
         pub head_commit: HeadCommit,
         pub before: String,
         pub commits: Vec<Commit>,
@@ -436,11 +435,6 @@ pub mod github {
         pub login: String,
     }
 
-    #[derive(Debug, Clone, Serialize, Deserialize)]
-    pub struct Committer {
-        pub username: String,
-    }
-
     #[derive(Debug, Clone, Serialize, Deserialize)]
     pub struct Response;
 }

site/src/github.rs

@@ -368,7 +368,7 @@ pub async fn merge_branch(
         .basic_auth("rust-timer", Some(timer_token))
         .send()
         .await
-        .context("POST git/commits failed")?;
+        .context("PATCH /merges failed")?;
     if !response.status().is_success() {
         anyhow::bail!("{:?} != 201 CREATED", response.status());
     }
@@ -445,7 +445,10 @@ pub async fn get_issue(
         .basic_auth("rust-timer", Some(timer_token))
         .send()
         .await
-        .context("cannot get commit")?;
+        .context("cannot get issue")?;
+    if !response.status().is_success() {
+        anyhow::bail!("{:?} != 200 OK", response.status());
+    }
 
     Ok(response.json().await?)
 }

site/src/request_handlers/github.rs

@@ -57,10 +57,11 @@ async fn handle_push(ctxt: Arc<SiteCtxt>, push: github::Push) -> ServerResult<gi
         // The second parent is the head of the PR that was rolled up. We want the second parent.
         let commit = get_commit(&client, &ctxt, repository_url, &rollup_merge)
             .await
-            .map_err(|e| format!("Error getting rollup merge commit: {e:?}"))?;
+            .map_err(|e| format!("Error getting rollup merge commit '{rollup_merge}': {e:?}"))?;
         assert!(
             commit.parents.len() == 2,
-            "What we thought was a merge commit was not a merge commit"
+            "What we thought was a merge commit was not a merge commit. sha: {}",
+            rollup_merge
         );
         let rolled_up_head = &commit.parents[1].sha;
 
@@ -106,9 +107,8 @@ async fn is_rollup(
             }
         };
     }
-    let is_bors = push.sender.login == "bors"
-        && push.committer.username == "bors"
-        && push.head_commit.message.starts_with("Auto merge of");
+    let is_bors =
+        push.sender.login == "bors" && push.head_commit.message.starts_with("Auto merge of");
 
     if !is_bors {
         return Ok(false);