From 9e1d640e407fb4afae6d9b8559ee43ca2f47d439 Mon Sep 17 00:00:00 2001
From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com>
Date: Sat, 24 Jun 2023 22:37:42 -0700
Subject: [PATCH] [internal] Update GitHub Actions workflow files (#381)

---
 scripts/upstream.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/upstream.sh b/scripts/upstream.sh
index 14a4df46..7c1933f6 100644
--- a/scripts/upstream.sh
+++ b/scripts/upstream.sh
@@ -91,14 +91,12 @@ start_rebase() {
 
   for patch in ../patches/*.patch; do
     echo "Applying $patch"
-    if ! git apply --3way "$patch"; then
+    if ! git am --3way "$patch"; then
       echo
       echo "Failed to apply patch. Please run 'make upstream.rebase FROM=$TAG' where '$TAG' allows the patch set to apply cleanly"
       echo
       exit 1
     fi
-    patch=${patch#../patches/*-}
-    git commit -am "${patch%.patch}"
   done
 
   touch ../rebase-in-progress