git-stack-cli 2.7.2 → 2.7.3

package/dist/js/index.js

@@ -37533,7 +37533,7 @@ function AutoUpdate(props) {
     async function init_state() {
       if (state.latest_version !== null)
         return;
-      const local_version = "2.7.2";
+      const local_version = "2.7.3";
       const latest_version = await get_latest_version();
       const is_brew_bun_standalone = get_is_brew_bun_standalone();
       patch({ local_version, latest_version, is_brew_bun_standalone });
@@ -45573,10 +45573,13 @@ async function command2(argv, options = {}) {
   if (options.parserConfiguration) {
     builder = builder.parserConfiguration(options.parserConfiguration);
   }
-  if (options.env_config) {
-    builder = builder.config(options.env_config);
-  }
-  const parsed = await builder.scriptName("git stack").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).command(["update", "upgrade"], "Check and install the latest version of git stack", (yargs) => yargs).command("config", "Generate a one-time configuration json based on the passed arguments", (yargs) => yargs.options(DefaultOptions)).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.7.2").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`");
+  const parsed = await builder.scriptName("git stack").usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => {
+    let builder2 = yargs.options(DefaultOptions);
+    if (options.env_config) {
+      builder2 = builder2.config(options.env_config);
+    }
+    return builder2;
+  }).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).command(["update", "upgrade"], "Check and install the latest version of git stack", (yargs) => yargs).command("config", "Generate a one-time configuration json based on the passed arguments", (yargs) => yargs.options(DefaultOptions)).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.7.3").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`");
   const result = parsed.argv;
   return result;
 }

package/package.json

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

package/src/command.ts

@@ -18,18 +18,22 @@ export async function command(argv: string[], options: CommandOptions = {}) {
     builder = builder.parserConfiguration(options.parserConfiguration);
   }
 
-  // apply overrides from config
-  // higher precedence than defaults, but lower precendence than cli flags
-  // perfect since that's what we want, prefer config only if not explicitly set on cli
-  if (options.env_config) {
-    builder = builder.config(options.env_config);
-  }
-
   const parsed = await builder
     .scriptName("git stack")
     .usage("Usage: git stack [command] [options]")
 
-    .command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions))
+    .command("$0", "Sync commit ranges to Github", (yargs) => {
+      let builder = yargs.options(DefaultOptions);
+
+      // apply overrides from config
+      // higher precedence than defaults, but lower precendence than cli flags
+      // perfect since that's what we want, prefer config only if not explicitly set on cli
+      if (options.env_config) {
+        builder = builder.config(options.env_config);
+      }
+
+      return builder;
+    })
 
     .command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) =>
       yargs.positional("commit", FixupOptions.commit),
@@ -52,6 +56,7 @@ export async function command(argv: string[], options: CommandOptions = {}) {
       "Check and install the latest version of git stack",
       (yargs) => yargs,
     )
+
     .command(
       "config",
       "Generate a one-time configuration json based on the passed arguments",