From 261d03d49aee62190ede72b5c171761b34ebd0f1 Mon Sep 17 00:00:00 2001
From: Chris Fenner <cfenn@google.com>
Date: Tue, 24 Sep 2024 15:43:46 +0000
Subject: [PATCH] instead of checking out the right parent, just reference the
 commit

---
 build.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/build.sh b/build.sh
index 077c40b..f04bc2e 100755
--- a/build.sh
+++ b/build.sh
@@ -246,17 +246,13 @@ fi
 EXTRA_PANDOC_OPTIONS=""
 if test "${DO_GITVERSION}" == "yes"; then
 	if [ ! -z "${PR_NUMBER}" ] && $(git rev-parse HEAD^2 >/dev/null 2>/dev/null); then
-		# For PR workflows, check out the right parent so that filenames etc.
-		# are based on the most recent commit on the source branch.
+		# For PR workflows, base the version info on the right parent.
 		# In the context of a GitHub pull request, HEAD is a merge commit where
 		# parent1 (HEAD^1) is the target branch and parent2 (HEAD~2) is the source
-		parent1=$(git rev-parse HEAD^1 2>/dev/null)
-		parent2=$(git rev-parse HEAD^2 2>/dev/null)
-		echo "Merge commit detected:"
-		echo "1: $parent1"
-		echo "2: $parent2"
-		echo "Checking out $parent2."
-		git checkout $parent2
+		GIT_COMMIT=$(git rev-parse --short HEAD^2)
+	else
+		# Otherwise, base the version info on HEAD.
+		GIT_COMMIT=$(git rev-parse --short HEAD)
 	fi
 
 	# TODO: Should we fail if dirty?
@@ -277,7 +273,6 @@ if test "${DO_GITVERSION}" == "yes"; then
 	#   Where $REVISION is the number of commits since the last tag (e.g., 54)
 	# $VERSION-$REVISION-g$COMMIT --> version without prerelease tag at a particular commit (len 3)
 	# $VERSION-$PRERELEASE-$REVISION-g$COMMIT --> version with  (len 4)
-	GIT_COMMIT=$(git rev-parse --short HEAD)
 	len=${#dash_hunks[@]}
 	case $len in
 		1)