Get full ref name without multiple invocations to git show-ref

dorny · Mar 25, 2021 · a6989ad · a6989ad
1 parent 6d81690
commit a6989ad
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 27 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -4010,22 +4010,19 @@ async function getFullRef(shortName) {
     if (isGitSha(shortName)) {
         return shortName;
     }
-    const remoteRef = `refs/remotes/origin/${shortName}`;
-    const tagRef = `refs/tags/${shortName}`;
-    const headRef = `refs/heads/${shortName}`;
-    if (await verifyRef(remoteRef)) {
-        return remoteRef;
-    }
-    else if (await verifyRef(tagRef)) {
-        return tagRef;
+    const output = (await exec_1.default('git', ['show-ref', shortName], { ignoreReturnCode: true })).stdout;
+    const refs = output
+        .split(/\r?\n/g)
+        .map(l => { var _a, _b; return (_b = (_a = l.match(/refs\/.*$/)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : ''; })
+        .filter(l => l !== '');
+    if (refs.length === 0) {
+        return undefined;
     }
-    else if (await verifyRef(headRef)) {
-        return headRef;
+    const remoteRef = refs.find(ref => ref.startsWith('refs/remotes/origin/'));
+    if (remoteRef) {
+        return remoteRef;
     }
-    return undefined;
-}
-async function verifyRef(ref) {
-    return (await exec_1.default('git', ['show-ref', '--verify', ref], { ignoreReturnCode: true })).code === 0;
+    return refs[0];
 }
 function fixStdOutNullTermination() {
     // Previous command uses NULL as delimiters and output is printed to stdout.

diff --git a/src/git.ts b/src/git.ts
@@ -207,22 +207,22 @@ async function getFullRef(shortName: string): Promise<string | undefined> {
     return shortName
   }
 
-  const remoteRef = `refs/remotes/origin/${shortName}`
-  const tagRef = `refs/tags/${shortName}`
-  const headRef = `refs/heads/${shortName}`
-  if (await verifyRef(remoteRef)) {
-    return remoteRef
-  } else if (await verifyRef(tagRef)) {
-    return tagRef
-  } else if (await verifyRef(headRef)) {
-    return headRef
+  const output = (await exec('git', ['show-ref', shortName], {ignoreReturnCode: true})).stdout
+  const refs = output
+    .split(/\r?\n/g)
+    .map(l => l.match(/refs\/.*$/)?.[0] ?? '')
+    .filter(l => l !== '')
+
+  if (refs.length === 0) {
+    return undefined
   }
 
-  return undefined
-}
+  const remoteRef = refs.find(ref => ref.startsWith('refs/remotes/origin/'))
+  if (remoteRef) {
+    return remoteRef
+  }
 
-async function verifyRef(ref: string): Promise<boolean> {
-  return (await exec('git', ['show-ref', '--verify', ref], {ignoreReturnCode: true})).code === 0
+  return refs[0]
 }
 
 function fixStdOutNullTermination(): void {