Merge pull request #432 from github/simon-engledew/fix-ref-check

Fix rev-parse errors
github · Mar 25, 2021 · bb012c4 · bb012c4
2 parents 972dc3e + ba14abb
commit bb012c4
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/lib/actions-util.js b/lib/actions-util.js
diff --git a/lib/actions-util.js.map b/lib/actions-util.js.map
diff --git a/lib/actions-util.test.js b/lib/actions-util.test.js
diff --git a/lib/actions-util.test.js.map b/lib/actions-util.test.js.map
diff --git a/src/actions-util.test.ts b/src/actions-util.test.ts
@@ -40,7 +40,7 @@ test("getRef() returns merge PR ref if GITHUB_REF still checked out but sha has
   const sha = "a".repeat(40);
 
   const callback = sinon.stub(actionsutil, "getCommitOid");
-  callback.withArgs("refs/pull/1/merge").resolves(sha);
+  callback.withArgs("refs/remotes/pull/1/merge").resolves(sha);
   callback.withArgs("HEAD").resolves(sha);
 
   const actualRef = await actionsutil.getRef();

diff --git a/src/actions-util.ts b/src/actions-util.ts
@@ -443,7 +443,10 @@ export async function getRef(): Promise<string> {
   // using GITHUB_REF. There is a subtle race condition where
   // git rev-parse GITHUB_REF != GITHUB_SHA, so we must check
   // git git-parse GITHUB_REF == git rev-parse HEAD instead.
-  const hasChangedRef = sha !== head && (await getCommitOid(ref)) !== head;
+  const hasChangedRef =
+    sha !== head &&
+    (await getCommitOid(ref.replace(/^refs\/pull\//, "refs/remotes/pull/"))) !==
+      head;
 
   if (hasChangedRef) {
     const newRef = ref.replace(pull_ref_regex, "refs/pull/$1/head");