git-stack-cli 1.11.6 → 1.11.7

package/dist/cjs/index.cjs

@@ -31917,11 +31917,11 @@ function VerboseDebugInfo(props) {
 async function run$2() {
     const actions = Store.getState().actions;
     try {
-        await cli(`git config --list --show-origin`);
         await cli(`echo HOME=$HOME`);
         await cli(`echo USER=$USER`);
         await cli(`echo GIT_AUTHOR_NAME=$GIT_AUTHOR_NAME`);
         await cli(`echo GIT_AUTHOR_EMAIL=$GIT_AUTHOR_EMAIL`);
+        await cli(`git config --list --show-origin`);
     }
     catch (err) {
         actions.error("Unable to log verbose debug information.");
@@ -31976,6 +31976,10 @@ async function run$1() {
     // get the commit SHA of the target commit
     const commit_sha = (await cli(`git rev-parse HEAD~${adjusted_number}`))
         .stdout;
+    actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "\uD83D\uDEE0\uFE0F fixup {relative_number} {commit_sha}", values: {
+            commit_sha: reactExports.createElement(Parens, null, commit_sha),
+            relative_number: relative_number,
+        } }));
     await cli(`git commit --fixup ${commit_sha}`);
     // check if stash required
     let save_stash = false;
@@ -31987,21 +31991,26 @@ async function run$1() {
         await cli("git stash -q");
         actions.output(reactExports.createElement(Text, null, "\uD83D\uDCE6 Changes saved to stash"));
     }
-    // rebase target needs to account for new commit created above
-    const rebase_target = Number(relative_number) + 1;
-    await cli(`git rebase -i --autosquash HEAD~${rebase_target}`, {
-        env: {
-            PATH: process.env.PATH,
-            GIT_EDITOR: "true",
-        },
-    });
-    actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "\uD83D\uDEE0\uFE0F fixup {relative_number} {commit_sha}", values: {
-            commit_sha: reactExports.createElement(Parens, null, commit_sha),
-            relative_number: relative_number,
-        } }));
-    if (save_stash) {
-        await cli("git stash pop -q");
-        actions.output(reactExports.createElement(Text, { color: colors.green }, "\u2705 Changes restored from stash"));
+    try {
+        // rebase target needs to account for new commit created above
+        const rebase_target = Number(relative_number) + 1;
+        await cli(`git rebase -i --autosquash HEAD~${rebase_target}`, {
+            env: {
+                ...process.env,
+                GIT_EDITOR: "true",
+            },
+        });
+    }
+    catch (error) {
+        actions.error("🚨 Fixup failed");
+        await cli("git rebase --abort");
+        await cli("git reset --soft HEAD~1");
+    }
+    finally {
+        if (save_stash) {
+            await cli("git stash pop -q");
+            actions.output(reactExports.createElement(Text, { color: colors.green }, "\u2705 Changes restored from stash"));
+        }
     }
 }
 
@@ -37420,7 +37429,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.11.6" )
+        .version("1.11.7" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
         .help("help", "Show usage via `git stack help`")
         .argv;

package/package.json

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

package/src/app/VerboseDebugInfo.tsx

@@ -29,11 +29,11 @@ async function run() {
   const actions = Store.getState().actions;
 
   try {
-    await cli(`git config --list --show-origin`);
     await cli(`echo HOME=$HOME`);
     await cli(`echo USER=$USER`);
     await cli(`echo GIT_AUTHOR_NAME=$GIT_AUTHOR_NAME`);
     await cli(`echo GIT_AUTHOR_EMAIL=$GIT_AUTHOR_EMAIL`);
+    await cli(`git config --list --show-origin`);
   } catch (err) {
     actions.error("Unable to log verbose debug information.");
 

package/src/commands/Fixup.tsx

@@ -74,6 +74,17 @@ async function run() {
   const commit_sha = (await cli(`git rev-parse HEAD~${adjusted_number}`))
     .stdout;
 
+  actions.output(
+    <FormatText
+      wrapper={<Ink.Text color={colors.yellow} />}
+      message="🛠️ fixup {relative_number} {commit_sha}"
+      values={{
+        commit_sha: <Parens>{commit_sha}</Parens>,
+        relative_number: relative_number,
+      }}
+    />
+  );
+
   await cli(`git commit --fixup ${commit_sha}`);
 
   // check if stash required
@@ -91,31 +102,27 @@ async function run() {
     actions.output(<Ink.Text>📦 Changes saved to stash</Ink.Text>);
   }
 
-  // rebase target needs to account for new commit created above
-  const rebase_target = Number(relative_number) + 1;
-  await cli(`git rebase -i --autosquash HEAD~${rebase_target}`, {
-    env: {
-      PATH: process.env.PATH,
-      GIT_EDITOR: "true",
-    },
-  });
-
-  actions.output(
-    <FormatText
-      wrapper={<Ink.Text color={colors.yellow} />}
-      message="🛠️ fixup {relative_number} {commit_sha}"
-      values={{
-        commit_sha: <Parens>{commit_sha}</Parens>,
-        relative_number: relative_number,
-      }}
-    />
-  );
-
-  if (save_stash) {
-    await cli("git stash pop -q");
-
-    actions.output(
-      <Ink.Text color={colors.green}>✅ Changes restored from stash</Ink.Text>
-    );
+  try {
+    // rebase target needs to account for new commit created above
+    const rebase_target = Number(relative_number) + 1;
+
+    await cli(`git rebase -i --autosquash HEAD~${rebase_target}`, {
+      env: {
+        ...process.env,
+        GIT_EDITOR: "true",
+      },
+    });
+  } catch (error) {
+    actions.error("🚨 Fixup failed");
+    await cli("git rebase --abort");
+    await cli("git reset --soft HEAD~1");
+  } finally {
+    if (save_stash) {
+      await cli("git stash pop -q");
+
+      actions.output(
+        <Ink.Text color={colors.green}>✅ Changes restored from stash</Ink.Text>
+      );
+    }
   }
 }