From 1a281b842a020a17225a3d236170c01911e620d1 Mon Sep 17 00:00:00 2001
From: Ryan Levick <me@ryanlevick.com>
Date: Thu, 11 Aug 2022 16:20:09 +0200
Subject: [PATCH] Take all commits that look like rollup merges

---
 site/src/request_handlers/github.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/site/src/request_handlers/github.rs b/site/src/request_handlers/github.rs
index f496e1fd9..359a206bd 100644
--- a/site/src/request_handlers/github.rs
+++ b/site/src/request_handlers/github.rs
@@ -51,8 +51,7 @@ async fn handle_push(ctxt: Arc<SiteCtxt>, push: github::Push) -> ServerResult<gi
         let rollup_merges = commits
             .iter()
             .rev()
-            .skip(1) // skip the head commit
-            .take_while(|c| c.message.starts_with("Rollup merge of "));
+            .filter(|c| c.message.starts_with("Rollup merge of #"));
         let result = unroll_rollup(
             ci_client,
             main_repo_client,