Merge pull request #224 from neilime/fix/git-suuport-grafted-pull-refs

crazy-max · web-flow · commit 5430d017a5f0 · 2023-12-15T16:58:16.000+01:00
fix(git): supports grafted pull refs
diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts
@@ -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(' ')}`;
diff --git a/src/git.ts b/src/git.ts
@@ -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}"`);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -137,12 +137,18 @@ export class Git {`
`137`	`137`	return `refs/tags/${ref.split(':')[1].trim()}`;
`138`	`138`	`}`
`139`	`139`
`140`		`- // Otherwise, it's a branch "<origin>/<branch-name>, <branch-name>"`
	`140`	`+ // Branch refs are formatted as "<origin>/<branch-name>, <branch-name>"`
`141`	`141`	`const branchMatch = ref.match(/^[^/]+\/[^/]+, (.+)$/);`
`142`	`142`	`if (branchMatch) {`
`143`	`143`	return `refs/heads/${branchMatch[1].trim()}`;
`144`	`144`	`}`
`145`	`145`
	`146`	`+ // Pull request merge refs are formatted as "pull/<number>/<state>"`
	`147`	`+ const prMatch = ref.match(/^pull\/\d+\/(head\|merge)$/);`
	`148`	`+ if (prMatch) {`
	`149`	+ return `refs/${ref}`;
	`150`	`+ }`
	`151`	`+`
`146`	`152`	throw new Error(`Unsupported detached HEAD ref in "${res}"`);
`147`	`153`	`}`
`148`	`154`