Merge pull request #225 from crazy-max/fix-bake-error

bake: correctly match error when parsing definition

__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(' ')}`;

src/buildx/bake.ts

@@ -77,7 +77,7 @@ export class Bake {
       silent: true
     }).then(res => {
       if (res.stderr.length > 0 && res.exitCode != 0) {
-        throw new Error(res.stderr);
+        throw new Error(`cannot parse bake definitions: ${res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'}`);
       }
       return <BakeDefinition>JSON.parse(res.stdout.trim());
     });

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}"`);
   }