allow aliases too

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>

Author: kiprasmel

git-stacked-rebase.ts

@@ -21,12 +21,13 @@ import { uniq } from "./util/uniq";
 import { parseTodoOfStackedRebase } from "./parse-todo-of-stacked-rebase/parseTodoOfStackedRebase";
 import { Termination } from "./util/error";
 import { assertNever } from "./util/assertNever";
+import { Single, Tuple } from "./util/tuple";
 import {
 	GoodCommand,
 	GoodCommandStacked, //
 	namesOfRebaseCommandsThatMakeRebaseExitToPause,
 	StackedRebaseCommand,
-	StackedRebaseEitherCommandOrAlias,
+	StackedRebaseCommandAlias,
 } from "./parse-todo-of-stacked-rebase/validator";
 
 // console.log = () => {};
@@ -633,17 +634,20 @@ export const gitStackedRebase = async (
 			// newLineBefore.splice(0, 1, "branch-end-last"); // remove 1st word ("branch-end") and add "branch-end-last"
 			// linesOfEditedRebaseTodo[newLatestBranchCmd.lineNumber] = newLineBefore.join(" ");
 
-			replaceCommandInText(oldLatestBranchCmd, "branch-end-last", "branch-end");
-			replaceCommandInText(newLatestBranchCmd, "branch-end-new", "branch-end-last");
+			replaceCommandInText(oldLatestBranchCmd, ["branch-end-last"], "branch-end");
+			replaceCommandInText(newLatestBranchCmd, ["branch-end-new", "ben"], "branch-end-last");
 
 			// eslint-disable-next-line no-inner-declarations
 			function replaceCommandInText(
 				cmd: GoodCommandStacked, //
-				expectedOldName: StackedRebaseEitherCommandOrAlias,
+				allowedOldName: Single<StackedRebaseCommand> | Tuple<StackedRebaseCommand, StackedRebaseCommandAlias>,
 				newName: StackedRebaseCommand
 			): void {
 				const words = linesOfEditedRebaseTodo[cmd.lineNumber].split(" ");
-				assert.equal(words[0], expectedOldName);
+				assert(
+					allowedOldName.some((n) => n === words[0]),
+					"invalid old name of command in git-rebase-todo file"
+				);
 				words[0] = newName;
 				linesOfEditedRebaseTodo[oldLatestBranchCmd.lineNumber] = words.join(" ");
 			}

util/tuple.ts

@@ -0,0 +1,9 @@
+/**
+ * ...because eslint >5 sucks
+ */
+
+export type Single<A> = [A];
+export type ReadonlySingle<A> = readonly [A];
+
+export type Tuple<A, B> = [A, B];
+export type ReadonlyTuple<A, B> = readonly [A, B];