From a925c9f83125f655284e1fb258e9dd12fc8539aa Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Mon, 21 Oct 2024 12:33:02 -0600
Subject: [PATCH] Buildah treadmill: more allow-empty options

Handle the condition where the second commit (the one making
podman-specific changes) is empty.

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 hack/buildah-vendor-treadmill | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/buildah-vendor-treadmill b/hack/buildah-vendor-treadmill
index dfb8e0ce82..de91bed960 100755
--- a/hack/buildah-vendor-treadmill
+++ b/hack/buildah-vendor-treadmill
@@ -285,7 +285,7 @@ END_FAIL_INSTRUCTIONS
         exit 1;
     };
     progress('Reapplying treadmill patches');
-    git('cherry-pick', '--allow-empty', $treadmill_commit);
+    git('cherry-pick', '--allow-empty', '--empty=keep', $treadmill_commit);
 
     # It worked! Clean up: remove our local die() handler and the saved branch
     undef $SIG{__DIE__};