Skip to content

Commit e20b699

Browse files
committed
fix: use the provided cmd
previously would just change to the correct thing, and then change back to the wrong one, because fn called twice for diff things, that's why the git-rebase-todo file looked the same Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
1 parent 45190af commit e20b699

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

git-stacked-rebase.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -627,9 +627,9 @@ export const gitStackedRebase = async (
627627
"invalid old name of command in git-rebase-todo file"
628628
);
629629
words[0] = newName;
630-
console.log({ before: linesOfEditedRebaseTodo[oldLatestBranchCmd.lineNumber] });
631-
linesOfEditedRebaseTodo[oldLatestBranchCmd.lineNumber] = words.join(" ");
632-
console.log({ after: linesOfEditedRebaseTodo[oldLatestBranchCmd.lineNumber] });
630+
console.log({ before: linesOfEditedRebaseTodo[cmd.lineNumber] });
631+
linesOfEditedRebaseTodo[cmd.lineNumber] = words.join(" ");
632+
console.log({ after: linesOfEditedRebaseTodo[cmd.lineNumber] });
633633
}
634634

635635
fs.writeFileSync(pathToStackedRebaseTodoFile, linesOfEditedRebaseTodo.join("\n"), { encoding: "utf-8" });

0 commit comments

Comments
 (0)