From 4b0de83c39718e6fca0c80fdeae7c4a9b2cb6c10 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 24 Feb 2025 16:04:29 +0000
Subject: [PATCH] ci/update: drop empty commits on re-apply

---
 .github/workflows/update.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index c1a57fe0..6d5fe854 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -170,7 +170,10 @@ jobs:
           if [[ -n "$commits" ]]; then
             echo "Applying ${#commits[@]} commits..."
             echo "count=${#commits[@]}" >> $GITHUB_OUTPUT
-            git cherry-pick --strategy-option=theirs "${commits[@]}"
+            git cherry-pick \
+              --strategy-option=theirs \
+              --empty=drop \
+              "${commits[@]}"
           else
             echo "Nothing to re-apply"
           fi