From b598643dcb366597b7dc4579972d7e9749ef76ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20K=C3=B6tte?= <steffen.koette@gmail.com>
Date: Sat, 13 Aug 2022 02:56:01 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20SKIP=5FPR=20option=20for?=
 =?UTF-8?q?=20runs=20with=20installation=20token=20(#232)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The original implementation for signed commits in #153 did not
consider the `SKIP_PR` flag - if used together with an installation
token it fails now.

This change adds support by:
1) comparing changes against the remote branch, as base branch and HEAD
   are the same
2) Skipping pr branch creation
3) using the base instead of the undefined prBranch as upload target
---
 dist/index.js | 33 ++++++++++++++++++---------------
 src/git.js    | 35 +++++++++++++++++++----------------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 2e803ee9..5ea94232 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -21513,6 +21513,7 @@ const {
 	COMMIT_PREFIX,
 	GITHUB_REPOSITORY,
 	OVERWRITE_EXISTING_PR,
+	SKIP_PR,
 	PR_BODY,
 	BRANCH_PREFIX,
 	FORK
@@ -21785,7 +21786,7 @@ class Git {
 	// Gets the commit list in chronological order
 	async getCommitsToPush() {
 		const output = await execCmd(
-			`git log --format=%H --reverse ${ this.baseBranch }..HEAD`,
+			`git log --format=%H --reverse ${ SKIP_PR === false ? `` : `origin/` }${ this.baseBranch }..HEAD`,
 			this.workingDir
 		)
 
@@ -21820,30 +21821,32 @@ class Git {
 	async createGithubVerifiedCommits() {
 		const commitsData = await this.getCommitsDataToPush()
 
-		// Creates the PR branch if doesn't exists
-		try {
-			await this.github.git.createRef({
-				owner: this.repo.user,
-				repo: this.repo.name,
-				sha: this.lastCommitSha,
-				ref: 'refs/heads/' + this.prBranch
-			})
+		if (SKIP_PR === false) {
+			// Creates the PR branch if doesn't exists
+			try {
+				await this.github.git.createRef({
+					owner: this.repo.user,
+					repo: this.repo.name,
+					sha: this.lastCommitSha,
+					ref: 'refs/heads/' + this.prBranch
+				})
 
-			core.debug(`Created new branch ${ this.prBranch }`)
-		} catch (error) {
-			// If the branch exists ignores the error
-			if (error.message !== 'Reference already exists') throw error
+				core.debug(`Created new branch ${ this.prBranch }`)
+			} catch (error) {
+				// If the branch exists ignores the error
+				if (error.message !== 'Reference already exists') throw error
+			}
 		}
 
 		for (const commitData of commitsData) {
 			await this.createGithubTreeAndCommit(commitData.tree, commitData.commitMessage)
 		}
 
-		core.debug(`Updating branch ${ this.prBranch } ref`)
+		core.debug(`Updating branch ${ SKIP_PR === false ? this.prBranch : this.baseBranch } ref`)
 		await this.github.git.updateRef({
 			owner: this.repo.user,
 			repo: this.repo.name,
-			ref: `heads/${ this.prBranch }`,
+			ref: `heads/${ SKIP_PR === false ? this.prBranch : this.baseBranch }`,
 			sha: this.lastCommitSha,
 			force: true
 		})
diff --git a/src/git.js b/src/git.js
index 9eeadee4..e7c0cdf1 100644
--- a/src/git.js
+++ b/src/git.js
@@ -16,6 +16,7 @@ const {
 	COMMIT_PREFIX,
 	GITHUB_REPOSITORY,
 	OVERWRITE_EXISTING_PR,
+	SKIP_PR,
 	PR_BODY,
 	BRANCH_PREFIX,
 	FORK
@@ -288,7 +289,7 @@ class Git {
 	// Gets the commit list in chronological order
 	async getCommitsToPush() {
 		const output = await execCmd(
-			`git log --format=%H --reverse ${ this.baseBranch }..HEAD`,
+			`git log --format=%H --reverse ${ SKIP_PR === false ? `` : `origin/` }${ this.baseBranch }..HEAD`,
 			this.workingDir
 		)
 
@@ -323,30 +324,32 @@ class Git {
 	async createGithubVerifiedCommits() {
 		const commitsData = await this.getCommitsDataToPush()
 
-		// Creates the PR branch if doesn't exists
-		try {
-			await this.github.git.createRef({
-				owner: this.repo.user,
-				repo: this.repo.name,
-				sha: this.lastCommitSha,
-				ref: 'refs/heads/' + this.prBranch
-			})
-
-			core.debug(`Created new branch ${ this.prBranch }`)
-		} catch (error) {
-			// If the branch exists ignores the error
-			if (error.message !== 'Reference already exists') throw error
+		if (SKIP_PR === false) {
+			// Creates the PR branch if doesn't exists
+			try {
+				await this.github.git.createRef({
+					owner: this.repo.user,
+					repo: this.repo.name,
+					sha: this.lastCommitSha,
+					ref: 'refs/heads/' + this.prBranch
+				})
+
+				core.debug(`Created new branch ${ this.prBranch }`)
+			} catch (error) {
+				// If the branch exists ignores the error
+				if (error.message !== 'Reference already exists') throw error
+			}
 		}
 
 		for (const commitData of commitsData) {
 			await this.createGithubTreeAndCommit(commitData.tree, commitData.commitMessage)
 		}
 
-		core.debug(`Updating branch ${ this.prBranch } ref`)
+		core.debug(`Updating branch ${ SKIP_PR === false ? this.prBranch : this.baseBranch } ref`)
 		await this.github.git.updateRef({
 			owner: this.repo.user,
 			repo: this.repo.name,
-			ref: `heads/${ this.prBranch }`,
+			ref: `heads/${ SKIP_PR === false ? this.prBranch : this.baseBranch }`,
 			sha: this.lastCommitSha,
 			force: true
 		})