Check out other refs/* by commit if provided, fall back to ref (#1924)

orhantoy · web-flow · commit de5a000abf73 · 2024-10-01T20:24:28.000-04:00
diff --git a/__test__/ref-helper.test.ts b/__test__/ref-helper.test.ts
@@ -77,6 +77,16 @@ describe('ref-helper tests', () => {
     expect(checkoutInfo.startPoint).toBeFalsy()
   })
 
+  it('getCheckoutInfo refs/ without commit', async () => {
+    const checkoutInfo = await refHelper.getCheckoutInfo(
+      git,
+      'refs/non-standard-ref',
+      ''
+    )
+    expect(checkoutInfo.ref).toBe('refs/non-standard-ref')
+    expect(checkoutInfo.startPoint).toBeFalsy()
+  })
+
   it('getCheckoutInfo unqualified branch only', async () => {
     git.branchExists = jest.fn(async (remote: boolean, pattern: string) => {
       return true
diff --git a/dist/index.js b/dist/index.js
@@ -2005,8 +2005,8 @@ function getCheckoutInfo(git, ref, commit) {
             result.ref = ref;
         }
         // refs/
-        else if (upperRef.startsWith('REFS/') && commit) {
-            result.ref = commit;
+        else if (upperRef.startsWith('REFS/')) {
+            result.ref = commit ? commit : ref;
         }
         // Unqualified ref, check for a matching branch or tag
         else {
diff --git a/src/ref-helper.ts b/src/ref-helper.ts
@@ -46,8 +46,8 @@ export async function getCheckoutInfo(
     result.ref = ref
   }
   // refs/
-  else if (upperRef.startsWith('REFS/') && commit) {
-    result.ref = commit
+  else if (upperRef.startsWith('REFS/')) {
+    result.ref = commit ? commit : ref
   }
   // Unqualified ref, check for a matching branch or tag
   else {

Original file line number	Diff line number	Diff line change
`@@ -2005,8 +2005,8 @@ function getCheckoutInfo(git, ref, commit) {`
`2005`	`2005`	`result.ref = ref;`
`2006`	`2006`	`}`
`2007`	`2007`	`// refs/`
`2008`		`- else if (upperRef.startsWith('REFS/') && commit) {`
`2009`		`- result.ref = commit;`
	`2008`	`+ else if (upperRef.startsWith('REFS/')) {`
	`2009`	`+ result.ref = commit ? commit : ref;`
`2010`	`2010`	`}`
`2011`	`2011`	`// Unqualified ref, check for a matching branch or tag`
`2012`	`2012`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ export async function getCheckoutInfo(`
`46`	`46`	`result.ref = ref`
`47`	`47`	`}`
`48`	`48`	`// refs/`
`49`		`- else if (upperRef.startsWith('REFS/') && commit) {`
`50`		`- result.ref = commit`
	`49`	`+ else if (upperRef.startsWith('REFS/')) {`
	`50`	`+ result.ref = commit ? commit : ref`
`51`	`51`	`}`
`52`	`52`	`// Unqualified ref, check for a matching branch or tag`
`53`	`53`	`else {`