git-stack-cli 2.1.5 → 2.2.1

package/dist/js/index.js

@@ -37042,7 +37042,7 @@ var BaseStore = createStore()(immer2((set2, get) => ({
   username: null,
   repo_path: null,
   repo_root: null,
-  master_branch: "master",
+  master_branch: "origin/master",
   head: null,
   branch_name: null,
   commit_range: null,
@@ -38689,7 +38689,7 @@ async function run() {
       }));
       master_branch = argv.branch;
     } else {
-      const detect_master = await cli(`git branch --list "${BRANCH.master}" --color=never`);
+      const detect_master = await cli(`git branch --list --remote "${BRANCH.master}" --color=never`);
       if (detect_master.stdout !== "") {
         master_branch = BRANCH.master;
       } else {
@@ -38703,13 +38703,14 @@ async function run() {
         master_branch = BRANCH.main;
       }
     }
+    actions.debug(`master_branch = ${master_branch}`);
     const branch_name = (await cli("git rev-parse --abbrev-ref HEAD")).stdout;
     if (branch_name === "HEAD") {
       actions.error("Must run within a branch.");
       actions.exit(0);
       return;
     }
-    if (branch_name === master_branch) {
+    if (`origin/${branch_name}` === master_branch) {
       actions.error("Must run within a branch.");
       actions.exit(0);
       return;
@@ -38748,8 +38749,8 @@ var RE5 = {
   repo_path: /(?<repo_path>[^:^/]+\/[^/]+)\.git/
 };
 var BRANCH = {
-  master: "master",
-  main: "main"
+  master: "origin/master",
+  main: "origin/main"
 };
 
 // src/app/GithubApiError.tsx
@@ -38955,7 +38956,8 @@ Rebase.run = async function run4() {
   try {
     process.chdir(repo_root);
     await cli(`pwd`);
-    await cli(`git fetch --no-tags -v origin ${master_branch}:${master_branch}`);
+    const master_branch_name = master_branch.replace(/^origin\//, "");
+    await cli(`git fetch --no-tags -v origin ${master_branch_name}`);
     const master_sha = (await cli(`git rev-parse ${master_branch}`)).stdout;
     const rebase_merge_base = master_sha;
     await cli(`git checkout -b ${temp_branch_name} ${rebase_merge_base}`);
@@ -45640,7 +45642,7 @@ var yargs_default = Yargs;
 
 // src/command.ts
 async function command2() {
-  return yargs_default(hideBin(process.argv)).usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.1.5").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
+  return yargs_default(hideBin(process.argv)).usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.2.1").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
 }
 var GlobalOptions = {
   verbose: {
@@ -45683,7 +45685,7 @@ var DefaultOptions = {
   branch: {
     type: "string",
     alias: ["b"],
-    description: 'Set the master branch name, defaults to "master" (or "main" if "master" is not found)'
+    description: 'Set the master branch name, defaults to "origin/master" (or "origin/main" if "origin/master" is not found)'
   },
   draft: {
     type: "boolean",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "2.1.5",
+  "version": "2.2.1",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/DetectInitialPR.tsx

@@ -160,7 +160,7 @@ export function DetectInitialPR(props: Props) {
       }
     }
 
-    // get latest merge_base relative to local master
+    // get latest merge_base relative to origin/master
     const rebase_group_index = 0;
 
     const rebase_merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;

package/src/app/GatherMetadata.tsx

@@ -44,7 +44,9 @@ async function run() {
 
       master_branch = argv.branch;
     } else {
-      const detect_master = await cli(`git branch --list "${BRANCH.master}" --color=never`);
+      const detect_master = await cli(
+        `git branch --list --remote "${BRANCH.master}" --color=never`,
+      );
 
       if (detect_master.stdout !== "") {
         master_branch = BRANCH.master;
@@ -63,6 +65,8 @@ async function run() {
       }
     }
 
+    actions.debug(`master_branch = ${master_branch}`);
+
     const branch_name = (await cli("git rev-parse --abbrev-ref HEAD")).stdout;
 
     // handle detahed head state
@@ -73,7 +77,7 @@ async function run() {
     }
 
     // handle when there are no detected changes
-    if (branch_name === master_branch) {
+    if (`origin/${branch_name}` === master_branch) {
       actions.error("Must run within a branch.");
       actions.exit(0);
       return;
@@ -124,6 +128,6 @@ const RE = {
 };
 
 const BRANCH = {
-  master: "master",
-  main: "main",
+  master: "origin/master",
+  main: "origin/main",
 };

package/src/app/Store.tsx

@@ -119,7 +119,7 @@ const BaseStore = createStore<State>()(
     username: null,
     repo_path: null,
     repo_root: null,
-    master_branch: "master",
+    master_branch: "origin/master",
     head: null,
     branch_name: null,
     commit_range: null,

package/src/command.ts

@@ -92,7 +92,7 @@ const DefaultOptions = {
     type: "string",
     alias: ["b"],
     description:
-      'Set the master branch name, defaults to "master" (or "main" if "master" is not found)',
+      'Set the master branch name, defaults to "origin/master" (or "origin/main" if "origin/master" is not found)',
   },
 
   "draft": {

package/src/commands/Rebase.tsx

@@ -53,8 +53,9 @@ Rebase.run = async function run() {
     process.chdir(repo_root);
     await cli(`pwd`);
 
-    // update local master to match remote
-    await cli(`git fetch --no-tags -v origin ${master_branch}:${master_branch}`);
+    // fetch origin master branch for latest sha
+    const master_branch_name = master_branch.replace(/^origin\//, "");
+    await cli(`git fetch --no-tags -v origin ${master_branch_name}`);
 
     const master_sha = (await cli(`git rev-parse ${master_branch}`)).stdout;
     const rebase_merge_base = master_sha;