git-stack-cli 1.2.5 → 1.2.6

package/README.md

@@ -80,9 +80,11 @@ Managing even a few stacked diffs requires a relatively strong knowledge of `git
 git submodule update --init --recursive
 npm i
 npm run dev
+npm unlink git-stack-cli
 npm link
 
 # navigate to project to test within
+npm unlink git-stack-cli
 npm link git-stack-cli
 
 git stack --verbose
@@ -98,7 +100,7 @@ npm run build:standalone
 
 > [!IMPORTANT]
 >
-> **You must update the `version` in `package.json` and commit all changes first!**
+> **You must update the `version` in `package.json` before running `npm run release`**
 
 ```bash
 npm run release

package/dist/cjs/index.cjs

@@ -26205,7 +26205,6 @@ const BaseStore = createStore()(immer((set, get) => ({
     repo_root: null,
     master_branch: "master",
     head: null,
-    merge_base: null,
     branch_name: null,
     commit_range: null,
     commit_map: null,
@@ -27048,7 +27047,6 @@ async function gather_metadata$1() {
             state.repo_root = repo_root;
             state.master_branch = master_branch;
             state.head = head;
-            state.merge_base = merge_base;
             state.branch_name = branch_name;
         });
     }
@@ -27551,9 +27549,11 @@ async function run$3() {
     process.once("SIGINT", handle_exit);
     const temp_branch_name = `${branch_name}_${short_id()}`;
     try {
+        actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
         // must perform rebase from repo root for applying git patch
         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}`);
         const master_sha = (await cli(`git rev-parse ${master_branch}`)).stdout;
         const rebase_merge_base = master_sha;
@@ -27832,13 +27832,12 @@ async function run$2(props) {
     const actions = state.actions;
     const argv = state.argv;
     const branch_name = state.branch_name;
-    const merge_base = state.merge_base;
     const commit_map = state.commit_map;
+    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(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");
@@ -27848,6 +27847,8 @@ async function run$2(props) {
     const commit_range = await range(commit_map);
     // reverse commit list so that we can cherry-pick in order
     commit_range.group_list.reverse();
+    // get latest merge_base relative to local master
+    const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
     let rebase_merge_base = merge_base;
     let rebase_group_index = 0;
     for (let i = 0; i < commit_range.group_list.length; i++) {
@@ -27863,8 +27864,8 @@ async function run$2(props) {
         }
         break;
     }
-    actions.debug(`rebase_merge_base=${rebase_merge_base}`);
-    actions.debug(`rebase_group_index=${rebase_group_index}`);
+    actions.debug(`rebase_merge_base = ${rebase_merge_base}`);
+    actions.debug(`rebase_group_index = ${rebase_group_index}`);
     actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
     try {
         // must perform rebase from repo root for applying git patch
@@ -34334,7 +34335,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.2.5" )
+        .version("1.2.6" )
         .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.2.5",
+  "version": "1.2.6",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/GatherMetadata.tsx

@@ -117,7 +117,6 @@ async function gather_metadata() {
       state.repo_root = repo_root;
       state.master_branch = master_branch;
       state.head = head;
-      state.merge_base = merge_base;
       state.branch_name = branch_name;
     });
   } catch (err) {

package/src/app/LocalMergeRebase.tsx

@@ -47,16 +47,18 @@ async function run() {
   const temp_branch_name = `${branch_name}_${short_id()}`;
 
   try {
+    actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
+
     // must perform rebase from repo root for applying git patch
     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}`
     );
 
     const master_sha = (await cli(`git rev-parse ${master_branch}`)).stdout;
-
     const rebase_merge_base = master_sha;
 
     // create temporary branch based on merge base

package/src/app/ManualRebase.tsx

@@ -38,14 +38,13 @@ async function run(props: Props) {
   const actions = state.actions;
   const argv = state.argv;
   const branch_name = state.branch_name;
-  const merge_base = state.merge_base;
   const commit_map = state.commit_map;
+  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(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");
@@ -60,6 +59,9 @@ async function run(props: Props) {
   // reverse commit list so that we can cherry-pick in order
   commit_range.group_list.reverse();
 
+  // get latest merge_base relative to local master
+  const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
+
   let rebase_merge_base = merge_base;
   let rebase_group_index = 0;
 
@@ -80,8 +82,8 @@ async function run(props: Props) {
     break;
   }
 
-  actions.debug(`rebase_merge_base=${rebase_merge_base}`);
-  actions.debug(`rebase_group_index=${rebase_group_index}`);
+  actions.debug(`rebase_merge_base = ${rebase_merge_base}`);
+  actions.debug(`rebase_group_index = ${rebase_group_index}`);
   actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
 
   try {

package/src/app/Store.tsx

@@ -34,7 +34,6 @@ export type State = {
   repo_root: null | string;
   master_branch: string;
   head: null | string;
-  merge_base: null | string;
   branch_name: null | string;
   commit_range: null | CommitMetadata.CommitRange;
   commit_map: null | CommitMap;
@@ -95,7 +94,6 @@ const BaseStore = createStore<State>()(
     repo_root: null,
     master_branch: "master",
     head: null,
-    merge_base: null,
     branch_name: null,
     commit_range: null,
     commit_map: null,