mirror of
https://code.forgejo.org/actions/checkout.git
synced 2024-12-25 03:55:54 +00:00
Handle hidden refs (#1774)
Co-authored-by: Chris Gavin <chris@chrisgavin.me>
This commit is contained in:
parent
b80ff79f17
commit
b17fe1e4d5
3 changed files with 20 additions and 2 deletions
|
@ -67,6 +67,16 @@ describe('ref-helper tests', () => {
|
||||||
expect(checkoutInfo.startPoint).toBeFalsy()
|
expect(checkoutInfo.startPoint).toBeFalsy()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('getCheckoutInfo refs/', async () => {
|
||||||
|
const checkoutInfo = await refHelper.getCheckoutInfo(
|
||||||
|
git,
|
||||||
|
'refs/gh/queue/main/pr-123',
|
||||||
|
commit
|
||||||
|
)
|
||||||
|
expect(checkoutInfo.ref).toBe(commit)
|
||||||
|
expect(checkoutInfo.startPoint).toBeFalsy()
|
||||||
|
})
|
||||||
|
|
||||||
it('getCheckoutInfo unqualified branch only', async () => {
|
it('getCheckoutInfo unqualified branch only', async () => {
|
||||||
git.branchExists = jest.fn(async (remote: boolean, pattern: string) => {
|
git.branchExists = jest.fn(async (remote: boolean, pattern: string) => {
|
||||||
return true
|
return true
|
||||||
|
|
6
dist/index.js
vendored
6
dist/index.js
vendored
|
@ -2000,9 +2000,13 @@ function getCheckoutInfo(git, ref, commit) {
|
||||||
result.ref = `refs/remotes/pull/${branch}`;
|
result.ref = `refs/remotes/pull/${branch}`;
|
||||||
}
|
}
|
||||||
// refs/tags/
|
// refs/tags/
|
||||||
else if (upperRef.startsWith('REFS/')) {
|
else if (upperRef.startsWith('REFS/TAGS/')) {
|
||||||
result.ref = ref;
|
result.ref = ref;
|
||||||
}
|
}
|
||||||
|
// refs/
|
||||||
|
else if (upperRef.startsWith('REFS/') && commit) {
|
||||||
|
result.ref = commit;
|
||||||
|
}
|
||||||
// Unqualified ref, check for a matching branch or tag
|
// Unqualified ref, check for a matching branch or tag
|
||||||
else {
|
else {
|
||||||
if (yield git.branchExists(true, `origin/${ref}`)) {
|
if (yield git.branchExists(true, `origin/${ref}`)) {
|
||||||
|
|
|
@ -42,9 +42,13 @@ export async function getCheckoutInfo(
|
||||||
result.ref = `refs/remotes/pull/${branch}`
|
result.ref = `refs/remotes/pull/${branch}`
|
||||||
}
|
}
|
||||||
// refs/tags/
|
// refs/tags/
|
||||||
else if (upperRef.startsWith('REFS/')) {
|
else if (upperRef.startsWith('REFS/TAGS/')) {
|
||||||
result.ref = ref
|
result.ref = ref
|
||||||
}
|
}
|
||||||
|
// refs/
|
||||||
|
else if (upperRef.startsWith('REFS/') && commit) {
|
||||||
|
result.ref = commit
|
||||||
|
}
|
||||||
// Unqualified ref, check for a matching branch or tag
|
// Unqualified ref, check for a matching branch or tag
|
||||||
else {
|
else {
|
||||||
if (await git.branchExists(true, `origin/${ref}`)) {
|
if (await git.branchExists(true, `origin/${ref}`)) {
|
||||||
|
|
Loading…
Reference in a new issue