@hanseltime/template-repo-sync 1.3.0 → 1.3.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.3.1](https://github.com/HanseltimeIndustries/template-repo-sync/compare/v1.3.0...v1.3.1) (2024-06-09)
+
+
+### Bug Fixes
+
+* skipping checkout default is specified ([ad7ba7d](https://github.com/HanseltimeIndustries/template-repo-sync/commit/ad7ba7dc795883f813f70ed2e9140ac6a9030845))
+
 # [1.3.0](https://github.com/HanseltimeIndustries/template-repo-sync/compare/v1.2.0...v1.3.0) (2024-06-09)
 
 

package/lib/cjs/checkout-drivers/git-checkout.js

@@ -4,14 +4,26 @@ exports.gitCheckout = void 0;
 const child_process_1 = require("child_process");
 async function gitCheckout(options) {
     const { branch, remoteName, tmpDir } = options;
-    (0, child_process_1.execSync)(`git fetch ${remoteName} ${branch}`, {
+    const remoteInfo = (0, child_process_1.execSync)(`git remote show ${remoteName}`, {
         cwd: tmpDir,
         env: process.env,
-    });
-    (0, child_process_1.execSync)(`git checkout -b ${branch} --track ${remoteName}/${branch}`, {
-        cwd: tmpDir,
-        env: process.env,
-    });
+    }).toString();
+    const defaultMatch = /HEAD branch:\s*([a-zA-Z0-9_-]+)/.exec(remoteInfo);
+    if (!defaultMatch || !defaultMatch[1]) {
+        throw new Error(`Could not determine default branch of cloned repo.\nAttempted to find in remote info:\n${remoteInfo} `);
+    }
+    const defaultBranch = defaultMatch[1];
+    // Skip this if the default branch is already pulled
+    if (defaultBranch !== branch) {
+        (0, child_process_1.execSync)(`git fetch ${remoteName} ${branch}`, {
+            cwd: tmpDir,
+            env: process.env,
+        });
+        (0, child_process_1.execSync)(`git checkout -b ${branch} --track ${remoteName}/${branch}`, {
+            cwd: tmpDir,
+            env: process.env,
+        });
+    }
     return true;
 }
 exports.gitCheckout = gitCheckout;

package/lib/esm/checkout-drivers/git-checkout.js

@@ -4,14 +4,26 @@ exports.gitCheckout = void 0;
 const child_process_1 = require("child_process");
 async function gitCheckout(options) {
     const { branch, remoteName, tmpDir } = options;
-    (0, child_process_1.execSync)(`git fetch ${remoteName} ${branch}`, {
+    const remoteInfo = (0, child_process_1.execSync)(`git remote show ${remoteName}`, {
         cwd: tmpDir,
         env: process.env,
-    });
-    (0, child_process_1.execSync)(`git checkout -b ${branch} --track ${remoteName}/${branch}`, {
-        cwd: tmpDir,
-        env: process.env,
-    });
+    }).toString();
+    const defaultMatch = /HEAD branch:\s*([a-zA-Z0-9_-]+)/.exec(remoteInfo);
+    if (!defaultMatch || !defaultMatch[1]) {
+        throw new Error(`Could not determine default branch of cloned repo.\nAttempted to find in remote info:\n${remoteInfo} `);
+    }
+    const defaultBranch = defaultMatch[1];
+    // Skip this if the default branch is already pulled
+    if (defaultBranch !== branch) {
+        (0, child_process_1.execSync)(`git fetch ${remoteName} ${branch}`, {
+            cwd: tmpDir,
+            env: process.env,
+        });
+        (0, child_process_1.execSync)(`git checkout -b ${branch} --track ${remoteName}/${branch}`, {
+            cwd: tmpDir,
+            env: process.env,
+        });
+    }
     return true;
 }
 exports.gitCheckout = gitCheckout;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanseltime/template-repo-sync",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "An npm library that enables pluggable, customizable synchronization between template repos",
   "main": "lib/cjs/index.js",
   "types": "lib/cjs/index.d.ts",

package/src/checkout-drivers/git-checkout.spec.ts

@@ -55,4 +55,15 @@ describe("gitCheckout", () => {
         }),
     ).rejects.toThrow();
   });
+  it("does not throw if the branch was the default", async () => {
+    await gitCheckout({
+      tmpDir: tmpRepoDir,
+      remoteName: "origin",
+      branch: "master", // We set this in the gitDir
+    });
+
+    expect(readFileSync(join(tmpRepoDir, "README.md")).toString()).toContain(
+      "# This is the master branch",
+    );
+  });
 });

package/src/checkout-drivers/git-checkout.ts

@@ -9,14 +9,30 @@ export async function gitCheckout(options: {
   branch: string;
 }): Promise<boolean> {
   const { branch, remoteName, tmpDir } = options;
-  execSync(`git fetch ${remoteName} ${branch}`, {
-    cwd: tmpDir,
-    env: process.env,
-  });
-  execSync(`git checkout -b ${branch} --track ${remoteName}/${branch}`, {
+
+  const remoteInfo = execSync(`git remote show ${remoteName}`, {
     cwd: tmpDir,
     env: process.env,
-  });
+  }).toString();
+  const defaultMatch = /HEAD branch:\s*([a-zA-Z0-9_-]+)/.exec(remoteInfo);
+  if (!defaultMatch || !defaultMatch[1]) {
+    throw new Error(
+      `Could not determine default branch of cloned repo.\nAttempted to find in remote info:\n${remoteInfo} `,
+    );
+  }
+
+  const defaultBranch = defaultMatch[1];
+  // Skip this if the default branch is already pulled
+  if (defaultBranch !== branch) {
+    execSync(`git fetch ${remoteName} ${branch}`, {
+      cwd: tmpDir,
+      env: process.env,
+    });
+    execSync(`git checkout -b ${branch} --track ${remoteName}/${branch}`, {
+      cwd: tmpDir,
+      env: process.env,
+    });
+  }
 
   return true;
 }