git-stack-cli 1.3.4 → 1.3.5

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

@@ -27595,7 +27595,7 @@ async function run$3() {
             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}"`);
+            await cli(`git cherry-pick "${first_commit.sha}^..${last_commit.sha}" --keep-redundant-commits`);
         }
         // after all commits have been cherry-picked and amended
         // move the branch pointer to the newly created temporary branch
@@ -28673,7 +28673,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 +34322,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.3.4" )
+        .version("1.3.5" )
         .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.5",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/LocalMergeRebase.tsx

@@ -111,7 +111,9 @@ async function run() {
       // 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}"`);
+      await cli(
+        `git cherry-pick "${first_commit.sha}^..${last_commit.sha}" --keep-redundant-commits`
+      );
     }
 
     // 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);