git-stack-cli 0.8.1 → 0.8.3

package/dist/app/GatherMetadata.js

@@ -41,6 +41,13 @@ async function gather_metadata() {
             }
         }
         const branch_name = (await cli("git rev-parse --abbrev-ref HEAD")).stdout;
+        // handle detahed head state
+        if (branch_name === "HEAD") {
+            actions.newline();
+            actions.error("Must run within a branch.");
+            actions.exit(0);
+            return;
+        }
         // handle when there are no detected changes
         if (branch_name === master_branch) {
             actions.newline();

package/dist/app/LocalMergeRebase.js

@@ -53,9 +53,13 @@ async function run() {
                         commit_message: React.createElement(Brackets, null, commit.message),
                     } }));
             }
+            // ensure clean base to avoid conflicts when applying patch
+            await cli(`git clean -fd`);
+            // create, apply and cleanup patch
             await cli(`git format-patch -1 ${commit.sha} --stdout > ${PATCH_FILE}`);
             await cli(`git apply ${PATCH_FILE}`);
             await cli(`rm ${PATCH_FILE}`);
+            // add all changes to stage
             await cli(`git add --all`);
             let new_message;
             if (commit.branch_id) {
@@ -108,9 +112,10 @@ async function run() {
         const spawn_options = { ignoreExitCode: true };
         // always clean up any patch files
         cli.sync(`rm ${PATCH_FILE}`, spawn_options);
-        // always hard reset to allow subsequent checkout
+        // always hard reset and clean to allow subsequent checkout
         // if there are files checkout will fail and cascade fail subsequent commands
         cli.sync(`git reset --hard`, spawn_options);
+        cli.sync(`git clean -df`, spawn_options);
         // always put self back in original branch
         cli.sync(`git checkout ${branch_name}`, spawn_options);
         // ...and cleanup temporary branch
@@ -135,4 +140,4 @@ async function run() {
         actions.exit(6);
     }
 }
-const PATCH_FILE = "mypatch.patch";
+const PATCH_FILE = "git-stack-cli-patch.patch";

package/dist/app/ManualRebase.js

@@ -54,12 +54,19 @@ async function run(props) {
         for (let i = rebase_group_index; i < commit_range.group_list.length; i++) {
             const group = commit_range.group_list[i];
             invariant(group.base, "group.base must exist");
+            actions.output(React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: colors.yellow, wrap: "truncate-end" }), message: "Rebasing {group}\u2026", values: {
+                    group: (React.createElement(Brackets, null, group.pr?.title || group.title || group.id)),
+                } }));
             const selected_url = get_group_url(group);
             // cherry-pick and amend commits one by one
             for (const commit of group.commits) {
+                // ensure clean base to avoid conflicts when applying patch
+                await cli(`git clean -fd`);
+                // create, apply and cleanup patch
                 await cli(`git format-patch -1 ${commit.sha} --stdout > ${PATCH_FILE}`);
                 await cli(`git apply ${PATCH_FILE}`);
                 await cli(`rm ${PATCH_FILE}`);
+                // add all changes to stage
                 await cli(`git add --all`);
                 const new_message = await Metadata.write(commit.message, group.id);
                 const git_commit_comand = [`git commit -m "${new_message}"`];
@@ -167,9 +174,10 @@ async function run(props) {
         const spawn_options = { ignoreExitCode: true };
         // always clean up any patch files
         cli.sync(`rm ${PATCH_FILE}`, spawn_options);
-        // always hard reset to allow subsequent checkout
+        // always hard reset and clean to allow subsequent checkout
         // if there are files checkout will fail and cascade fail subsequent commands
         cli.sync(`git reset --hard`, spawn_options);
+        cli.sync(`git clean -df`, spawn_options);
         // always put self back in original branch
         cli.sync(`git checkout ${branch_name}`, spawn_options);
         // ...and cleanup temporary branch
@@ -195,4 +203,4 @@ async function run(props) {
     }
 }
 const get_group_url = (group) => group.pr?.url || group.id;
-const PATCH_FILE = "mypatch.patch";
+const PATCH_FILE = "git-stack-cli-patch.patch";

package/dist/app/MultiSelect.js

@@ -94,7 +94,7 @@ export function MultiSelect(props) {
         const active = i === index;
         const selected = selected_set.has(i);
         const disabled = item.disabled || false;
-        return (React.createElement(ItemRow, { key: item.label, label: item.label, active: active, selected: selected, disabled: disabled, maxWidth: props.maxWidth }));
+        return (React.createElement(ItemRow, { key: i, label: item.label, active: active, selected: selected, disabled: disabled, maxWidth: props.maxWidth }));
     })));
 }
 function ItemRow(props) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "",
   "author": "magus",
   "license": "MIT",
@@ -19,9 +19,11 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
-    "lint": "eslint . --fix",
-    "prettier": "prettier ./src --write",
-    "test": "npm run prettier && npm run lint && npm run build",
+    "lint:check": "eslint .",
+    "lint": "npm run lint:check -- --fix",
+    "prettier:check": "prettier ./src --check",
+    "prettier": "npm run prettier:check -- --write",
+    "test": "npm run prettier:check && npm run lint:check && npm run build",
     "prepublishOnly": "npm test"
   },
   "dependencies": {