From 808e528e718ccf1f1f56918be0614cfd33d2e10a Mon Sep 17 00:00:00 2001
From: Pulumi Bot <bot@pulumi.com>
Date: Wed, 17 Jul 2024 05:22:36 +0000
Subject: [PATCH] [internal] Update GitHub Actions workflow files

---
 Makefile    | 2 +-
 upstream.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2044fe82..8e78d94d 100644
--- a/Makefile
+++ b/Makefile
@@ -165,7 +165,7 @@ tfgen_build_only:
 
 upstream:
 ifneq ("$(wildcard upstream)","")
-	./upstream.sh init
+	./upstream.sh init -f
 endif
 
 bin/pulumi-java-gen: .pulumi-java-gen.version
diff --git a/upstream.sh b/upstream.sh
index d285aaa7..f56ca1a5 100755
--- a/upstream.sh
+++ b/upstream.sh
@@ -97,7 +97,7 @@ Either stage or reset the 'upstream' submodule changes before continuing:
 
     git add upstream
     # or #
-    git checkout upstream
+    (cd upstream && git checkout <current submodule commit of origin/default> && cd -)
 
 EOF
     exit 1