git-stack-cli 1.11.2 → 1.11.4

package/README.md

@@ -13,7 +13,7 @@
 
 ## Demo
 
-> <img src="https://github.com/magus/git-multi-diff-playground/assets/290084/069c304b-80cb-49a9-9dc6-4ed3b061a5bc">
+> <img alt="git stack demo" src="https://github.com/magus/git-multi-diff-playground/assets/290084/069c304b-80cb-49a9-9dc6-4ed3b061a5bc">
 
 ## Install
 
@@ -54,6 +54,25 @@ git stack --no-verify # skip git hooks such as pre-commit and pre-push
 git stack help        # print a table of all CLI arguments
 ```
 
+### Editing existing commits and pull requests
+
+Sometimes you want to add changes to an existing commit or pull request.
+With `git-stack` this is as simple as amending the commit.
+
+1. `git add` your changes to the stage
+2. `git stack log` to find the relative commit number you want to amend
+3. `git stack fixup <number>` to amend the specific commit with your staged changes.
+
+```bash
+git add -p
+git stack log
+git stack fixup 2
+```
+
+> <img alt="git stack fixup demo" src="https://github.com/user-attachments/assets/2cdfaa5b-00be-4ed3-8bed-4a24c412979b">
+
+Running `git stack` afterward will update any existing pull requests with your changes.
+
 ## Why?
 
 The goal of `git stack` is to combine the **simplicity of developing in a single branch** in order to **preserve your commit history** while also **grouping commits into pull requests for code review**.

package/dist/cjs/index.cjs

@@ -29774,9 +29774,12 @@ async function pr_create(args) {
     return cli_result.stdout;
 }
 async function pr_edit(args) {
-    const cli_result = await cli(
-    // prettier-ignore
-    `gh pr edit ${args.branch} --base ${args.base} --body-file="${body_file(args.body)}"`);
+    const command_parts = [`gh pr edit ${args.branch} --base ${args.base}`];
+    if (args.body) {
+        command_parts.push(`--body-file="${body_file(args.body)}"`);
+    }
+    const command = command_parts.join(" ");
+    const cli_result = await cli(command);
     if (cli_result.code !== 0) {
         handle_error(cli_result.output);
     }
@@ -30160,7 +30163,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 });
                 }
             }
@@ -30908,6 +30911,15 @@ async function run$5() {
         actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow, wrap: "truncate-end" }), message: "Syncing {group}\u2026", values: {
                 group: (reactExports.createElement(Brackets, null, group.pr?.title || group.title || group.id)),
             } }));
+        // before pushing reset base to master temporarily
+        // avoid accidentally pointing to orphaned parent commit
+        // should hopefully fix issues where a PR includes a bunch of commits after pushing
+        if (group.pr) {
+            await pr_edit({
+                branch: group.id,
+                base: master_branch,
+            });
+        }
         // push to origin since github requires commit shas to line up perfectly
         const git_push_command = [`git push -f origin HEAD:${group.id}`];
         if (argv.verify === false) {
@@ -37380,7 +37392,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.11.2" )
+        .version("1.11.4" )
         .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.2",
+  "version": "1.11.4",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/scripts/release-npm.ts

@@ -17,6 +17,13 @@ await fs.mkdir(DIST_DIR, { recursive: true });
 
 process.chdir(PROJECT_DIR);
 
+// require clean git status besides changes to package.json version
+const git_status = await spawn.sync("git status --porcelain");
+if (!/^M\s+package.json/.test(git_status.stdout)) {
+  console.error("please commit local changes before running release");
+  process.exit(4);
+}
+
 const package_json = await file.read_json(
   path.join(PROJECT_DIR, "package.json")
 );

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

@@ -289,6 +289,16 @@ async function run() {
       />
     );
 
+    // before pushing reset base to master temporarily
+    // avoid accidentally pointing to orphaned parent commit
+    // should hopefully fix issues where a PR includes a bunch of commits after pushing
+    if (group.pr) {
+      await github.pr_edit({
+        branch: group.id,
+        base: master_branch,
+      });
+    }
+
     // push to origin since github requires commit shas to line up perfectly
     const git_push_command = [`git push -f origin HEAD:${group.id}`];
 

package/src/core/github.tsx

@@ -141,14 +141,19 @@ export async function pr_create(args: CreatePullRequestArgs) {
 type EditPullRequestArgs = {
   branch: string;
   base: string;
-  body: string;
+  body?: string;
 };
 
 export async function pr_edit(args: EditPullRequestArgs) {
-  const cli_result = await cli(
-    // prettier-ignore
-    `gh pr edit ${args.branch} --base ${args.base} --body-file="${body_file(args.body)}"`
-  );
+  const command_parts = [`gh pr edit ${args.branch} --base ${args.base}`];
+
+  if (args.body) {
+    command_parts.push(`--body-file="${body_file(args.body)}"`);
+  }
+
+  const command = command_parts.join(" ");
+
+  const cli_result = await cli(command);
 
   if (cli_result.code !== 0) {
     handle_error(cli_result.output);