Publish

merrymake · Nov 22, 2023 · 8119adc · 8119adc
1 parent 057cf1e
commit 8119adc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -0,0 +1,4 @@
+# 1.6.4
+
+- Introduced CHANGELOG 🥳
+- Fixed bug if git.initialBranch is master
diff --git a/dist/windows.zip b/dist/windows.zip
diff --git a/executors.js b/executors.js
@@ -29,7 +29,7 @@ function clone(struct, name) {
             fs_1.default.mkdirSync(`${name}/.merrymake`, { recursive: true });
             let orgFile = { name };
             fs_1.default.writeFileSync(`${name}/.merrymake/conf.json`, JSON.stringify(orgFile));
-            yield (0, utils_1.execPromise)(`git clone -q "${config_1.GIT_HOST}/${name}/event-catalogue" event-catalogue`, name);
+            yield (0, utils_1.execPromise)(`git clone --branch main -q "${config_1.GIT_HOST}/${name}/event-catalogue" event-catalogue`, name);
             fetch(".", name, struct);
         }
         catch (e) {
@@ -168,6 +168,7 @@ function createService(pth, group, name) {
                 else
                     throw e;
             }
+            yield (0, utils_1.execPromise)(`git symbolic-ref HEAD refs/heads/main`, name);
             (0, utils_1.addExitMessage)(`Use '${prompt_1.YELLOW}cd ${pth
                 .with(name)
                 .toString()

diff --git a/executors.ts b/executors.ts
@@ -31,7 +31,7 @@ async function clone(struct: any, name: string) {
     let orgFile: OrgFile = { name };
     fs.writeFileSync(`${name}/.merrymake/conf.json`, JSON.stringify(orgFile));
     await execPromise(
-      `git clone -q "${GIT_HOST}/${name}/event-catalogue" event-catalogue`,
+      `git clone --branch main -q "${GIT_HOST}/${name}/event-catalogue" event-catalogue`,
       name
     );
     fetch(".", name, struct);
@@ -175,6 +175,7 @@ export async function createService(pth: Path, group: string, name: string) {
       ) {
       } else throw e;
     }
+    await execPromise(`git symbolic-ref HEAD refs/heads/main`, name);
     addExitMessage(
       `Use '${YELLOW}cd ${pth
         .with(name)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@merrymake/cli",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "",
   "main": "index.js",
   "scripts": {