git-stack-cli 1.11.3 → 1.11.5

package/dist/cjs/index.cjs

@@ -30109,6 +30109,9 @@ echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
         `git`,
         `revise --edit -i ${args.rebase_merge_base}`,
     ];
+    // ignore here is important to prevent scrollback clear
+    // change to pipe to see output temporarily
+    // https://github.com/magus/git-stack-cli/commit/f9f10e3ac3cd9a35ee75d3e0851a48391967a23f
     await cli(command, { stdio: ["ignore", "ignore", "ignore"] });
 };
 
@@ -30163,7 +30166,7 @@ function DetectInitialPR(props) {
             if (!has_existing_metadata) {
                 // check for pr with matching branch name to initialize group
                 const pr = await pr_status(branch_name);
-                if (pr) {
+                if (pr && pr.state === "OPEN") {
                     return patch({ status: "prompt", pr });
                 }
             }
@@ -30738,13 +30741,11 @@ async function run$5() {
     const actions = state.actions;
     const argv = state.argv;
     const branch_name = state.branch_name;
-    const original_commit_range = cloneDeep$1(state.commit_range);
     const commit_map = state.commit_map;
     const master_branch = state.master_branch;
     const cwd = state.cwd;
     const repo_root = state.repo_root;
     invariant(branch_name, "branch_name must exist");
-    invariant(original_commit_range, "original_commit_range must exist");
     invariant(commit_map, "commit_map must exist");
     invariant(repo_root, "repo_root must exist");
     // always listen for SIGINT event and restore git state
@@ -30752,8 +30753,10 @@ async function run$5() {
     // get latest merge_base relative to local master
     const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
     // immediately paint all commit to preserve selected commit ranges
-    original_commit_range.group_list.reverse();
-    for (const commit of original_commit_range.commit_list) {
+    let commit_range = await range(commit_map);
+    // reverse group list to ensure we create git revise in correct order
+    commit_range.group_list.reverse();
+    for (const commit of commit_range.commit_list) {
         const group_from_map = commit_map[commit.sha];
         commit.branch_id = group_from_map.id;
         commit.title = group_from_map.title;
@@ -30761,14 +30764,14 @@ async function run$5() {
     await GitReviseTodo.execute({
         rebase_group_index: 0,
         rebase_merge_base: merge_base,
-        commit_range: original_commit_range,
+        commit_range,
     });
     let DEFAULT_PR_BODY = "";
     if (state.pr_template_body) {
         DEFAULT_PR_BODY = state.pr_template_body;
     }
     const temp_branch_name = `${branch_name}_${short_id()}`;
-    const commit_range = await range(commit_map);
+    commit_range = await range(commit_map);
     // reverse commit list so that we can cherry-pick in order
     commit_range.group_list.reverse();
     let rebase_merge_base = merge_base;
@@ -37392,7 +37395,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.11.3" )
+        .version("1.11.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.11.3",
+  "version": "1.11.5",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/DetectInitialPR.tsx

@@ -126,7 +126,8 @@ export function DetectInitialPR(props: Props) {
       if (!has_existing_metadata) {
         // check for pr with matching branch name to initialize group
         const pr = await github.pr_status(branch_name);
-        if (pr) {
+
+        if (pr && pr.state === "OPEN") {
           return patch({ status: "prompt", pr });
         }
       }

package/src/app/ManualRebase.tsx

@@ -3,7 +3,6 @@ import * as React from "react";
 import fs from "node:fs";
 
 import * as Ink from "ink-cjs";
-import cloneDeep from "lodash/cloneDeep";
 
 import { Await } from "~/app/Await";
 import { Brackets } from "~/app/Brackets";
@@ -33,14 +32,12 @@ async function run() {
   const actions = state.actions;
   const argv = state.argv;
   const branch_name = state.branch_name;
-  const original_commit_range = cloneDeep(state.commit_range);
   const commit_map = state.commit_map;
   const master_branch = state.master_branch;
   const cwd = state.cwd;
   const repo_root = state.repo_root;
 
   invariant(branch_name, "branch_name must exist");
-  invariant(original_commit_range, "original_commit_range must exist");
   invariant(commit_map, "commit_map must exist");
   invariant(repo_root, "repo_root must exist");
 
@@ -51,8 +48,12 @@ async function run() {
   const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
 
   // immediately paint all commit to preserve selected commit ranges
-  original_commit_range.group_list.reverse();
-  for (const commit of original_commit_range.commit_list) {
+  let commit_range = await CommitMetadata.range(commit_map);
+
+  // reverse group list to ensure we create git revise in correct order
+  commit_range.group_list.reverse();
+
+  for (const commit of commit_range.commit_list) {
     const group_from_map = commit_map[commit.sha];
     commit.branch_id = group_from_map.id;
     commit.title = group_from_map.title;
@@ -61,7 +62,7 @@ async function run() {
   await GitReviseTodo.execute({
     rebase_group_index: 0,
     rebase_merge_base: merge_base,
-    commit_range: original_commit_range,
+    commit_range,
   });
 
   let DEFAULT_PR_BODY = "";
@@ -71,7 +72,7 @@ async function run() {
 
   const temp_branch_name = `${branch_name}_${short_id()}`;
 
-  const commit_range = await CommitMetadata.range(commit_map);
+  commit_range = await CommitMetadata.range(commit_map);
 
   // reverse commit list so that we can cherry-pick in order
   commit_range.group_list.reverse();

package/src/core/GitReviseTodo.ts

@@ -136,6 +136,9 @@ GitReviseTodo.execute = async function grt_execute(args: ExecuteArgs) {
     `revise --edit -i ${args.rebase_merge_base}`,
   ];
 
+  // ignore here is important to prevent scrollback clear
+  // change to pipe to see output temporarily
+  // https://github.com/magus/git-stack-cli/commit/f9f10e3ac3cd9a35ee75d3e0851a48391967a23f
   await cli(command, { stdio: ["ignore", "ignore", "ignore"] });
 };