git-stack-cli 2.2.0 → 2.2.2

package/dist/js/index.js

@@ -37813,7 +37813,7 @@ function Url(props) {
 import fs7 from "node:fs";
 import path4 from "node:path";
 function is_command_available(command) {
-  const PATH = "/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/.rvm/gems/ruby-3.0.0/bin:/Users/noah/.rvm/gems/ruby-3.0.0@global/bin:/Users/noah/.rvm/rubies/ruby-3.0.0/bin:/Users/noah/Library/pnpm:/Users/noah/.bun/bin:/Users/noah/Library/Caches/fnm_multishells/78744_1743048463501/bin:/usr/local/sbin:/usr/local/bin:/usr/local/bin:/usr/local/sbin:/Users/noah/.dotfiles/bin:/usr/local/sbin:/usr/local/bin:/Users/noah/.openai/bin:/Users/noah/.virtualenvs/openai/bin:/Users/noah/.pyenv/shims:/Users/noah/.pyenv/bin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/Apple/usr/bin:/usr/local/go/bin:/Users/noah/.cargo/bin:/Users/noah/Applications/iTerm.app/Contents/Resources/utilities:/Users/noah/.openai/bin:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin:/usr/local/go/bin:/usr/local/opt/fzf/bin:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin:/usr/local/go/bin:/Users/noah/.rvm/bin";
+  const PATH = "/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/.rvm/gems/ruby-3.0.0/bin:/Users/noah/.rvm/gems/ruby-3.0.0@global/bin:/Users/noah/.rvm/rubies/ruby-3.0.0/bin:/Users/noah/Library/pnpm:/Users/noah/.bun/bin:/Users/noah/Library/Caches/fnm_multishells/17014_1743051860894/bin:/usr/local/sbin:/usr/local/bin:/usr/local/bin:/usr/local/sbin:/Users/noah/.dotfiles/bin:/usr/local/sbin:/usr/local/bin:/Users/noah/.openai/bin:/Users/noah/.virtualenvs/openai/bin:/Users/noah/.pyenv/shims:/Users/noah/.pyenv/bin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/Apple/usr/bin:/usr/local/go/bin:/Users/noah/.cargo/bin:/Users/noah/Applications/iTerm.app/Contents/Resources/utilities:/Users/noah/.openai/bin:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin:/usr/local/go/bin:/usr/local/opt/fzf/bin:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin:/usr/local/go/bin:/Users/noah/.rvm/bin";
   invariant(PATH, "PATH env must exist");
   const path_list = PATH.split(path4.delimiter);
   for (const dir of path_list) {
@@ -38115,10 +38115,11 @@ async function pr_status(branch) {
 }
 async function pr_create(args) {
   const title = safe_quote(args.title);
+  const base = args.base.replace(/^origin\//, "");
   let command_parts = [
     "gh pr create",
     `--head refs/heads/${args.branch}`,
-    `--base ${args.base}`,
+    `--base ${base}`,
     `--title="${title}"`,
     `--body="${args.body}"`
   ];
@@ -38133,7 +38134,8 @@ async function pr_create(args) {
   return cli_result.stdout;
 }
 async function pr_edit(args) {
-  const command_parts = [`gh pr edit ${args.branch} --base ${args.base}`];
+  const base = args.base.replace(/^origin\//, "");
+  const command_parts = [`gh pr edit ${args.branch} --base ${base}`];
   let body_file;
   if (args.body) {
     body_file = await write_body_file(args);
@@ -38201,7 +38203,8 @@ function handle_error(output) {
 }
 async function write_body_file(args) {
   invariant(args.body, "args.body must exist");
-  let tmp_filename = safe_filename(`git-stack-body-${args.base}`);
+  const base = args.base.replace(/^origin\//, "");
+  let tmp_filename = safe_filename(`git-stack-body-${base}`);
   const temp_path = path6.join(await get_tmp_dir(), tmp_filename);
   await safe_rm(temp_path);
   await fs9.writeFile(temp_path, args.body);
@@ -38289,7 +38292,8 @@ async function range(commit_group_map) {
       group_list.push(group);
     }
     if (i2 === 0) {
-      group.base = master_branch;
+      const master_branch_name = master_branch.replace(/^origin\//, "");
+      group.base = master_branch_name;
     } else {
       const last_group = group_value_list[i2 - 1];
       if (group.id === UNASSIGNED) {
@@ -45642,7 +45646,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.2.0").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.2").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
 }
 var GlobalOptions = {
   verbose: {

package/package.json

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

package/src/core/CommitMetadata.ts

@@ -132,7 +132,8 @@ export async function range(commit_group_map?: CommitGroupMap) {
     }
 
     if (i === 0) {
-      group.base = master_branch;
+      const master_branch_name = master_branch.replace(/^origin\//, "");
+      group.base = master_branch_name;
     } else {
       const last_group = group_value_list[i - 1];
       // console.debug("  ", "last_group", last_group.pr?.title.substring(0, 40));

package/src/core/github.tsx

@@ -125,14 +125,17 @@ export async function pr_create(args: CreatePullRequestArgs) {
 
   // explicit refs/heads head branch to avoid creation failing
   //
-  //   ❯ gh pr create --head origin/gs-ED2etrzv2 --base gs-6LAx-On45 --title="2024-01-05 test" --body=""
+  //   ❯ gh pr create --head refs/heads/gs-ED2etrzv2 --base gs-6LAx-On45 --title="2024-01-05 test" --body=""
   //   pull request create failed: GraphQL: Head sha can't be blank, Base sha can't be blank, No commits between gs-6LAx-On45 and origin/gs-ED2etrzv2, Head ref must be a branch (createPullRequest)
   //
   // https://github.com/cli/cli/issues/5465
+
+  const base = args.base.replace(/^origin\//, "");
+
   let command_parts = [
     "gh pr create",
     `--head refs/heads/${args.branch}`,
-    `--base ${args.base}`,
+    `--base ${base}`,
     `--title="${title}"`,
     `--body="${args.body}"`,
   ];
@@ -158,7 +161,8 @@ type EditPullRequestArgs = {
 };
 
 export async function pr_edit(args: EditPullRequestArgs) {
-  const command_parts = [`gh pr edit ${args.branch} --base ${args.base}`];
+  const base = args.base.replace(/^origin\//, "");
+  const command_parts = [`gh pr edit ${args.branch} --base ${base}`];
 
   let body_file: string | undefined;
 
@@ -269,7 +273,8 @@ async function write_body_file(args: EditPullRequestArgs) {
   // ensure unique filename is safe for filesystem
   // base (group id) might contain slashes, e.g. dev/magus/gs-3cmrMBSUj
   // the flashes would mess up the filesystem path to this file
-  let tmp_filename = safe_filename(`git-stack-body-${args.base}`);
+  const base = args.base.replace(/^origin\//, "");
+  let tmp_filename = safe_filename(`git-stack-body-${base}`);
 
   const temp_path = path.join(await get_tmp_dir(), tmp_filename);