mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 21:05:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix moving a commit across an exec todo

Browse source
This commit is contained in:
Stefan Haller 2024-12-01 17:07:57 +01:00
parent 49c50fc95c
commit 83356d441f
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/utils/rebase_todo.go
View file

@ -286,9 +286,9 @@ func RemoveUpdateRefsForCopiedBranch(fileName string, commentChar byte) error {
} }
// We render a todo in the commits view if it's a commit or if it's an // We render a todo in the commits view if it's a commit or if it's an
// update-ref. We don't render label, reset, or comment lines. // update-ref or exec. We don't render label, reset, or comment lines.
func isRenderedTodo(t todo.Todo) bool { func isRenderedTodo(t todo.Todo) bool {
return t.Commit != "" || t.Command == todo.UpdateRef return t.Commit != "" || t.Command == todo.UpdateRef || t.Command == todo.Exec
} }
func DropMergeCommit(fileName string, hash string, commentChar byte) error { func DropMergeCommit(fileName string, hash string, commentChar byte) error {

8
pkg/utils/rebase_todo_test.go
View file

@ -89,12 +89,8 @@ func TestRebaseCommands_moveTodoDown(t *testing.T) {
todoToMoveDown: Todo{Hash: "5678"}, todoToMoveDown: Todo{Hash: "5678"},
expectedErr: "", expectedErr: "",
expectedTodos: []todo.Todo{ expectedTodos: []todo.Todo{
/* EXPECTED:
{Command: todo.Pick, Commit: "1234"}, {Command: todo.Pick, Commit: "1234"},
{Command: todo.Pick, Commit: "5678"}, {Command: todo.Pick, Commit: "5678"},
ACTUAL: */
{Command: todo.Pick, Commit: "5678"},
{Command: todo.Pick, Commit: "1234"},
{Command: todo.Exec, ExecCommand: "make test"}, {Command: todo.Exec, ExecCommand: "make test"},
}, },
}, },
@ -250,12 +246,8 @@ func TestRebaseCommands_moveTodoUp(t *testing.T) {
expectedErr: "", expectedErr: "",
expectedTodos: []todo.Todo{ expectedTodos: []todo.Todo{
{Command: todo.Exec, ExecCommand: "make test"}, {Command: todo.Exec, ExecCommand: "make test"},
/* EXPECTED:
{Command: todo.Pick, Commit: "1234"}, {Command: todo.Pick, Commit: "1234"},
{Command: todo.Pick, Commit: "5678"}, {Command: todo.Pick, Commit: "5678"},
ACTUAL: */
{Command: todo.Pick, Commit: "5678"},
{Command: todo.Pick, Commit: "1234"},
}, },
}, },
{ {