venfork 0.1.1 → 0.2.0

package/dist/index.js

@@ -8217,12 +8217,25 @@ async function setupCommand(upstreamUrl, privateMirrorName, organization) {
     await $2`gh repo create ${privateMirrorRepoName} --private --clone=false`;
     s.stop("Private mirror repository created");
     s.start("Cloning upstream repository");
-    await $2`git clone --bare ${config.upstreamUrl} ${tempDir}`;
+    await $2`git clone ${config.upstreamUrl} ${tempDir}`;
     s.stop("Upstream cloned");
-    s.start("Pushing to private mirror repository");
+    s.start("Detecting default branch");
+    const result = await $2({
+      cwd: tempDir,
+      reject: false
+    })`git symbolic-ref refs/remotes/origin/HEAD`;
+    let defaultBranch = "main";
+    if (result.exitCode === 0) {
+      const match = result.stdout.trim().match(/refs\/remotes\/origin\/(.+)$/);
+      if (match?.[1]) {
+        defaultBranch = match[1];
+      }
+    }
+    s.stop(`Default branch: ${defaultBranch}`);
+    s.start(`Pushing ${defaultBranch} to private mirror repository`);
     await $2({
       cwd: tempDir
-    })`git push --mirror git@github.com:${owner}/${config.privateMirrorName}.git`;
+    })`git push git@github.com:${owner}/${config.privateMirrorName}.git ${defaultBranch}:${defaultBranch}`;
     s.stop("Pushed to private mirror repository");
     s.start("Cloning private mirror repository locally");
     await $2`git clone git@github.com:${owner}/${config.privateMirrorName}.git`;
@@ -8626,17 +8639,25 @@ async function main() {
   }
   switch (command) {
     case "setup": {
-      const orgIndex = args.indexOf("--org");
       let organization;
       let upstreamUrl = args[1];
       let privateMirrorName = args[2];
-      if (orgIndex !== -1) {
-        organization = args[orgIndex + 1];
-        const filteredArgs = args.filter((_3, i2) => i2 !== orgIndex && i2 !== orgIndex + 1);
+      const orgEqualArg = args.find((arg) => arg.startsWith("--org="));
+      if (orgEqualArg) {
+        organization = orgEqualArg.split("=")[1];
+        const filteredArgs = args.filter((arg) => !arg.startsWith("--org="));
         upstreamUrl = filteredArgs[1];
         privateMirrorName = filteredArgs[2];
-      } else if (process.env.VENFORK_ORG) {
-        organization = process.env.VENFORK_ORG;
+      } else {
+        const orgIndex = args.indexOf("--org");
+        if (orgIndex !== -1) {
+          organization = args[orgIndex + 1];
+          const filteredArgs = args.filter((_3, i2) => i2 !== orgIndex && i2 !== orgIndex + 1);
+          upstreamUrl = filteredArgs[1];
+          privateMirrorName = filteredArgs[2];
+        } else if (process.env.VENFORK_ORG) {
+          organization = process.env.VENFORK_ORG;
+        }
       }
       await setupCommand(upstreamUrl, privateMirrorName, organization);
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "venfork",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Create and manage private mirrors for vendor development",
   "type": "module",
   "bin": {