feat: allow re-ordering latest branch w/o having to create a new one

Signed-off-by: Kipras Melnikovas <[email protected]>

Author: kiprasmel

git-stacked-rebase.ts

@@ -496,6 +496,7 @@ export const gitStackedRebase = async (
 
 		if (isThereANewLatestBranch) {
 			let newLatestBranchCmdIndex: number | null = null;
+			let userOnlyReorderedWithoutCreatingNew: boolean = false;
 			for (let i = goodCommands.length - 1; i >= 0; i--) {
 				const cmd = goodCommands[i];
 				if (cmd.commandName === "branch-end-new") {
@@ -504,19 +505,30 @@ export const gitStackedRebase = async (
 				}
 			}
 			if (newLatestBranchCmdIndex === null || newLatestBranchCmdIndex <= oldLatestBranchCmdIndex) {
-				// TODO validator
-				const when =
-					newLatestBranchCmdIndex === null
-						? "at all"
-						: newLatestBranchCmdIndex <= oldLatestBranchCmdIndex
-						? "after the branch-end-latest command"
-						: ""; // assertNever(newLatestBranchCmdIndex);
-
-				throw new Termination(
-					"\n" +
-						`apparently a new latest branch was attempted (by adding commands _after_ the "branch-end-last")` +
-						`\nbut there was no "branch-end-new" command (${when})`
-				);
+				/**
+				 * check if wanted to re-order w/o creating a new branch
+				 */
+				const hasExistingBranchAsLatest: boolean =
+					goodCommands[goodCommands.length - 1].commandName === "branch-end";
+
+				if (newLatestBranchCmdIndex === null && hasExistingBranchAsLatest) {
+					newLatestBranchCmdIndex = goodCommands.length - 1;
+					userOnlyReorderedWithoutCreatingNew = true;
+				} else {
+					// TODO validator
+					const when =
+						newLatestBranchCmdIndex === null
+							? "at all"
+							: newLatestBranchCmdIndex <= oldLatestBranchCmdIndex
+							? "after the branch-end-latest command"
+							: ""; // assertNever(newLatestBranchCmdIndex);
+
+					throw new Termination(
+						"\n" +
+							`apparently a new latest branch was attempted (by adding commands _after_ the "branch-end-last")` +
+							`\nbut there was no "branch-end-new" command (${when})`
+					);
+				}
 			}
 
 			/**
@@ -575,10 +587,12 @@ export const gitStackedRebase = async (
 			const oldLatestBranchCmd: GoodCommandStacked = goodCommands[oldLatestBranchCmdIndex] as GoodCommandStacked; // TODO TS
 			const newLatestBranchCmd: GoodCommandStacked = goodCommands[newLatestBranchCmdIndex] as GoodCommandStacked; // TODO TS
 
-			/**
-			 * create the new "latest branch"
-			 */
-			await createBranchForCommand(newLatestBranchCmd as any); // TODO TS
+			if (!userOnlyReorderedWithoutCreatingNew) {
+				/**
+				 * create the new "latest branch"
+				 */
+				await createBranchForCommand(newLatestBranchCmd as any); // TODO TS
+			}
 
 			/**
 			 * move the old "latest branch" earlier to it's target
@@ -599,7 +613,11 @@ export const gitStackedRebase = async (
 			const linesOfEditedRebaseTodo: string[] = editedRebaseTodo.split("\n");
 
 			replaceCommandInText(oldLatestBranchCmd, ["branch-end-last"], "branch-end");
-			replaceCommandInText(newLatestBranchCmd, ["branch-end-new", "ben"], "branch-end-last");
+			replaceCommandInText(
+				newLatestBranchCmd, //
+				userOnlyReorderedWithoutCreatingNew ? ["branch-end", "be"] : ["branch-end-new", "ben"],
+				"branch-end-last"
+			);
 
 			// eslint-disable-next-line no-inner-declarations
 			function replaceCommandInText(