From 00d9d6ae454f61ff16335b65265ffb5ae331b7db Mon Sep 17 00:00:00 2001
From: Alan Crosswell <alan@columbia.edu>
Date: Fri, 22 Jan 2021 15:01:01 -0500
Subject: [PATCH] Add missing ref fix that was applied to github and gitlab.

---
 .../src/scaffolder/stages/prepare/bitbucket.test.ts      | 2 ++
 .../src/scaffolder/stages/prepare/bitbucket.ts           | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/bitbucket.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/bitbucket.test.ts
index ff74fffdd7..32822ae289 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/bitbucket.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/bitbucket.test.ts
@@ -89,6 +89,7 @@ describe('BitbucketPreparer', () => {
     expect(mockGitClient.clone).toHaveBeenCalledWith({
       url: 'https://bitbucket.org/backstage-project/backstage-repo',
       dir: expect.any(String),
+      ref: expect.any(String),
     });
   });
 
@@ -113,6 +114,7 @@ describe('BitbucketPreparer', () => {
     expect(mockGitClient.clone).toHaveBeenCalledWith({
       url: 'https://bitbucket.org/backstage-project/backstage-repo',
       dir: expect.any(String),
+      ref: expect.any(String),
     });
   });
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/bitbucket.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/bitbucket.ts
index 5020a5f658..04f48e3005 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/bitbucket.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/bitbucket.ts
@@ -49,15 +49,15 @@ export class BitbucketPreparer implements PreparerBase {
     const logger = opts.logger;
     const templateId = template.metadata.name;
 
-    const repo = parseGitUrl(location);
-    const repositoryCheckoutUrl = repo.toString('https');
-
+    const parsedGitLocation = parseGitUrl(location);
+    const repositoryCheckoutUrl = parsedGitLocation.toString('https');
+    const ref = parsedGitLocation.ref;
     const tempDir = await fs.promises.mkdtemp(
       path.join(workingDirectory, templateId),
     );
 
     const templateDirectory = path.join(
-      `${path.dirname(repo.filepath)}`,
+      `${path.dirname(parsedGitLocation.filepath)}`,
       template.spec.path ?? '.',
     );
 
@@ -73,6 +73,7 @@ export class BitbucketPreparer implements PreparerBase {
 
     await git.clone({
       url: repositoryCheckoutUrl,
+      ref: ref,
       dir: tempDir,
     });