update commands only after updating the text file contents

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

Author: kiprasmel

git-stacked-rebase.ts

@@ -593,28 +593,6 @@ export const gitStackedRebase = async (
 			 */
 			await repo.checkoutBranch(newLatestBranchCmd.targets![0]);
 
-			/**
-			 * update the commands
-			 * TODO update in the actual `git-rebase-todo` file
-			 */
-			// swapKeys(oldLatestBranchCmd, newLatestBranchCmd, "commandName");
-			// swapKeys(oldLatestBranchCmd, newLatestBranchCmd, "commandOrAliasName"); // eslint-disable-line prettier/prettier
-
-			// // eslint-disable-next-line no-inner-declarations
-			// function swapKeys<T>(A: T, B: T, key: keyof T): void {
-			// 	[A[key], B[key]] = [B[key], A[key]];
-			// }
-
-			/**
-			 * need to change to "branch-end", instead of "branch-end-new",
-			 * since obviously the branch already exists
-			 */
-			oldLatestBranchCmd.commandName = "branch-end";
-			oldLatestBranchCmd.commandOrAliasName = "branch-end";
-
-			newLatestBranchCmd.commandName = "branch-end-last";
-			newLatestBranchCmd.commandOrAliasName = "branch-end-last";
-
 			/**
 			 * TODO FIXME don't do this so hackishly lmao
 			 */
@@ -649,11 +627,37 @@ export const gitStackedRebase = async (
 					"invalid old name of command in git-rebase-todo file"
 				);
 				words[0] = newName;
+				console.log({ before: linesOfEditedRebaseTodo[oldLatestBranchCmd.lineNumber] });
 				linesOfEditedRebaseTodo[oldLatestBranchCmd.lineNumber] = words.join(" ");
+				console.log({ after: linesOfEditedRebaseTodo[oldLatestBranchCmd.lineNumber] });
 			}
 
 			fs.writeFileSync(pathToStackedRebaseTodoFile, linesOfEditedRebaseTodo.join("\n"), { encoding: "utf-8" });
 
+			/**
+			 * update the commands
+			 * TODO update in the actual `git-rebase-todo` file
+			 */
+			// swapKeys(oldLatestBranchCmd, newLatestBranchCmd, "commandName");
+			// swapKeys(oldLatestBranchCmd, newLatestBranchCmd, "commandOrAliasName"); // eslint-disable-line prettier/prettier
+
+			// // eslint-disable-next-line no-inner-declarations
+			// function swapKeys<T>(A: T, B: T, key: keyof T): void {
+			// 	[A[key], B[key]] = [B[key], A[key]];
+			// }
+
+			/**
+			 * need to change to "branch-end", instead of "branch-end-new",
+			 * since obviously the branch already exists
+			 *
+			 * TODO RE-PARSE ALL COMMANDS FROM THE FILE INSTEAD
+			 */
+			oldLatestBranchCmd.commandName = "branch-end";
+			oldLatestBranchCmd.commandOrAliasName = "branch-end";
+
+			newLatestBranchCmd.commandName = "branch-end-last";
+			newLatestBranchCmd.commandOrAliasName = "branch-end-last";
+
 			/**
 			 * it's fine if the new "latest branch" does not have
 			 * a remote set yet, because `--push` handles that,