From ea21f9c12b083af45b29a88c35ce3dc4cc115fe9 Mon Sep 17 00:00:00 2001
From: Alan Crosswell <alan@columbia.edu>
Date: Fri, 22 Jan 2021 13:18:21 -0500
Subject: [PATCH] pass in the specified git branch ref when cloning a single
 branch

---
 .../src/scaffolder/stages/prepare/github.test.ts                | 2 ++
 .../scaffolder-backend/src/scaffolder/stages/prepare/github.ts  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/github.test.ts
index b43545f5fc..4051e5d30d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/github.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/github.test.ts
@@ -89,6 +89,7 @@ describe('GitHubPreparer', () => {
     expect(mockGitClient.clone).toHaveBeenCalledWith({
       url: 'https://github.com/benjdlambert/backstage-graphql-template',
       dir: expect.any(String),
+      ref: expect.any(String),
     });
   });
 
@@ -100,6 +101,7 @@ describe('GitHubPreparer', () => {
     expect(mockGitClient.clone).toHaveBeenCalledWith({
       url: 'https://github.com/benjdlambert/backstage-graphql-template',
       dir: expect.any(String),
+      ref: expect.any(String),
     });
   });
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/github.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/github.ts
index cfeff454e7..02cbb1c5cd 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/github.ts
@@ -42,6 +42,7 @@ export class GithubPreparer implements PreparerBase {
 
     const parsedGitLocation = parseGitUrl(location);
     const repositoryCheckoutUrl = parsedGitLocation.toString('https');
+    const ref = parsedGitLocation.ref;
     const tempDir = await fs.promises.mkdtemp(
       path.join(workingDirectory, templateId),
     );
@@ -63,6 +64,7 @@ export class GithubPreparer implements PreparerBase {
 
     await git.clone({
       url: repositoryCheckoutUrl,
+      ref: ref,
       dir: tempDir,
     });