Skip to content

Commit

Permalink
Merge pull request #224 from neilime/fix/git-suuport-grafted-pull-refs
Browse files Browse the repository at this point in the history
fix(git): supports grafted pull refs
  • Loading branch information
crazy-max authored Dec 15, 2023
2 parents f8ca396 + e3bdf20 commit 5430d01
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
24 changes: 24 additions & 0 deletions __tests__/git.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,30 @@ describe('ref', () => {
expect(ref).toEqual('refs/tags/8.0.0');
});

it('returns mocked detached pull request merge ref (shallow clone)', async () => {
jest.spyOn(Exec, 'getExecOutput').mockImplementation((cmd, args): Promise<ExecOutput> => {
const fullCmd = `${cmd} ${args?.join(' ')}`;
let result = '';
switch (fullCmd) {
case 'git branch --show-current':
result = '';
break;
case 'git show -s --pretty=%D':
result = 'grafted, HEAD, pull/221/merge';
break;
}
return Promise.resolve({
stdout: result,
stderr: '',
exitCode: 0
});
});

const ref = await Git.ref();

expect(ref).toEqual('refs/pull/221/merge');
});

it('should throws an error when detached HEAD ref is not supported', async () => {
jest.spyOn(Exec, 'getExecOutput').mockImplementation((cmd, args): Promise<ExecOutput> => {
const fullCmd = `${cmd} ${args?.join(' ')}`;
Expand Down
8 changes: 7 additions & 1 deletion src/git.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,18 @@ export class Git {
return `refs/tags/${ref.split(':')[1].trim()}`;
}

// Otherwise, it's a branch "<origin>/<branch-name>, <branch-name>"
// Branch refs are formatted as "<origin>/<branch-name>, <branch-name>"
const branchMatch = ref.match(/^[^/]+\/[^/]+, (.+)$/);
if (branchMatch) {
return `refs/heads/${branchMatch[1].trim()}`;
}

// Pull request merge refs are formatted as "pull/<number>/<state>"
const prMatch = ref.match(/^pull\/\d+\/(head|merge)$/);
if (prMatch) {
return `refs/${ref}`;
}

throw new Error(`Unsupported detached HEAD ref in "${res}"`);
}

Expand Down

0 comments on commit 5430d01

Please sign in to comment.