git-stack-cli 0.8.3 → 0.8.4

package/dist/app/GatherMetadata.js

@@ -69,8 +69,10 @@ async function gather_metadata() {
         // https://github.com/magus/git-multi-diff-playground.git
         const origin_url = (await cli(`git config --get remote.origin.url`)).stdout;
         const repo_path = match_group(origin_url, RE.repo_path, "repo_path");
+        const repo_root = (await cli(`git rev-parse --show-toplevel`)).stdout;
         Store.setState((state) => {
             state.repo_path = repo_path;
+            state.repo_root = repo_root;
             state.master_branch = master_branch;
             state.head = head;
             state.merge_base = merge_base;

package/dist/app/LocalMergeRebase.js

@@ -1,4 +1,5 @@
 import * as React from "react";
+import fs from "node:fs";
 import * as Ink from "ink";
 import * as CommitMetadata from "../core/CommitMetadata.js";
 import * as Metadata from "../core/Metadata.js";
@@ -21,13 +22,20 @@ async function run() {
     const branch_name = state.branch_name;
     const commit_range = state.commit_range;
     const master_branch = state.master_branch;
+    const cwd = state.cwd;
+    const repo_root = state.repo_root;
     invariant(argv, "argv must exist");
     invariant(branch_name, "branch_name must exist");
     invariant(commit_range, "commit_range must exist");
+    invariant(cwd, "cwd must exist");
+    invariant(repo_root, "repo_root must exist");
     // always listen for SIGINT event and restore git state
     process.once("SIGINT", handle_exit);
     const temp_branch_name = `${branch_name}_${short_id()}`;
     try {
+        // must perform rebase from repo root for applying git patch
+        process.chdir(repo_root);
+        await cli(`pwd`);
         await cli(`git fetch --no-tags -v origin ${master_branch}:${master_branch}`);
         const master_sha = (await cli(`git rev-parse ${master_branch}`)).stdout;
         const rebase_merge_base = master_sha;
@@ -126,6 +134,12 @@ async function run() {
                 cli.sync(`git branch -D ${group.id}`, spawn_options);
             }
         }
+        // restore back to original dir
+        invariant(cwd, "cwd must exist");
+        if (fs.existsSync(cwd)) {
+            process.chdir(cwd);
+        }
+        cli.sync(`pwd`, spawn_options);
     }
     function handle_exit() {
         actions.output(React.createElement(Ink.Text, { color: colors.yellow },

package/dist/app/ManualRebase.js

@@ -1,4 +1,5 @@
 import * as React from "react";
+import fs from "node:fs";
 import * as Ink from "ink";
 import * as CommitMetadata from "../core/CommitMetadata.js";
 import * as Metadata from "../core/Metadata.js";
@@ -22,10 +23,14 @@ async function run(props) {
     const branch_name = state.branch_name;
     const merge_base = state.merge_base;
     const commit_map = state.commit_map;
+    const cwd = state.cwd;
+    const repo_root = state.repo_root;
     invariant(argv, "argv must exist");
     invariant(branch_name, "branch_name must exist");
     invariant(merge_base, "merge_base must exist");
     invariant(commit_map, "commit_map must exist");
+    invariant(cwd, "cwd must exist");
+    invariant(repo_root, "repo_root must exist");
     // always listen for SIGINT event and restore git state
     process.once("SIGINT", handle_exit);
     const temp_branch_name = `${branch_name}_${short_id()}`;
@@ -48,6 +53,9 @@ async function run(props) {
         break;
     }
     try {
+        // must perform rebase from repo root for applying git patch
+        process.chdir(repo_root);
+        await cli(`pwd`);
         // create temporary branch based on merge base
         await cli(`git checkout -b ${temp_branch_name} ${rebase_merge_base}`);
         const pr_url_list = commit_range.group_list.map(get_group_url);
@@ -188,6 +196,12 @@ async function run(props) {
                 cli.sync(`git branch -D ${group.id}`, spawn_options);
             }
         }
+        // restore back to original dir
+        invariant(cwd, "cwd must exist");
+        if (fs.existsSync(cwd)) {
+            process.chdir(cwd);
+        }
+        cli.sync(`pwd`, spawn_options);
     }
     function handle_exit() {
         actions.output(React.createElement(Ink.Text, { color: colors.yellow },

package/dist/app/Store.js

@@ -10,6 +10,7 @@ const BaseStore = createStore()(immer((set, get) => ({
     cwd: null,
     username: null,
     repo_path: null,
+    repo_root: null,
     master_branch: "master",
     head: null,
     merge_base: null,

package/package.json

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