git-stack-cli 1.3.4 → 1.3.6

package/README.md

@@ -100,11 +100,8 @@ npm run build:standalone
 
 > [!IMPORTANT]
 >
-> **You must update the `version` in `package.json` before running `npm run release`**
->
-> ```bash
-> npm version patch
-> ```
+> **You must update the `version` in `package.json` before running `npm run release`.
+> DO NOT use `npm version` or commit the change, the release scripts handle git tags etc.**
 
 ```bash
 npm run release

package/dist/cjs/index.cjs

@@ -27589,13 +27589,11 @@ async function run$3() {
             picked_commit_list.push(commit);
         }
         if (picked_commit_list.length > 0) {
-            const first_commit = picked_commit_list.at(0);
-            const last_commit = picked_commit_list.at(-1);
-            invariant(first_commit, "first_commit must exist");
-            invariant(last_commit, "last_commit must exist");
             // ensure clean base to avoid conflicts when applying patch
             await cli(`git clean -fd`);
-            await cli(`git cherry-pick "${first_commit.sha}^..${last_commit.sha}"`);
+            // create list of sha for cherry-pick
+            const sha_list = picked_commit_list.map((commit) => commit.sha).join(" ");
+            await cli(`git cherry-pick --keep-redundant-commits ${sha_list}`);
         }
         // after all commits have been cherry-picked and amended
         // move the branch pointer to the newly created temporary branch
@@ -28673,7 +28671,10 @@ function SelectCommitRangesInternal(props) {
         const commit_metadata_id = commit_map.get(commit.sha);
         const selected = commit_metadata_id !== null;
         let disabled;
-        if (group.id === props.commit_range.UNASSIGNED) {
+        if (group_input) {
+            disabled = true;
+        }
+        else if (group.id === props.commit_range.UNASSIGNED) {
             disabled = true;
         }
         else {
@@ -34319,7 +34320,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.3.4" )
+        .version("1.3.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.3.4",
+  "version": "1.3.6",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/LocalMergeRebase.tsx

@@ -102,16 +102,13 @@ async function run() {
     }
 
     if (picked_commit_list.length > 0) {
-      const first_commit = picked_commit_list.at(0);
-      const last_commit = picked_commit_list.at(-1);
-
-      invariant(first_commit, "first_commit must exist");
-      invariant(last_commit, "last_commit must exist");
-
       // ensure clean base to avoid conflicts when applying patch
       await cli(`git clean -fd`);
 
-      await cli(`git cherry-pick "${first_commit.sha}^..${last_commit.sha}"`);
+      // create list of sha for cherry-pick
+      const sha_list = picked_commit_list.map((commit) => commit.sha).join(" ");
+
+      await cli(`git cherry-pick --keep-redundant-commits ${sha_list}`);
     }
 
     // after all commits have been cherry-picked and amended

package/src/app/SelectCommitRanges.tsx

@@ -166,7 +166,9 @@ function SelectCommitRangesInternal(props: Props) {
 
     let disabled;
 
-    if (group.id === props.commit_range.UNASSIGNED) {
+    if (group_input) {
+      disabled = true;
+    } else if (group.id === props.commit_range.UNASSIGNED) {
       disabled = true;
     } else {
       disabled = Boolean(selected && commit_metadata_id !== group.id);