go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-03 00:57:52 +02:00
Code Issues Releases Activity

Fix moving a commit across a branch boundary in a stack

Browse Source 
See the previous commit for a detailed explanation.
This commit is contained in:
Stefan Haller
2024-12-02 11:35:35 +01:00
parent cf27974ea3
commit a9ef69b9c7
5 changed files with 60 additions and 29 deletions
pkg
app
daemon
daemon.go
commands
git_commands
rebase.go
integration
tests
interactive_rebase
move_across_branch_boundary_outside_rebase.go
utils
rebase_todo.gorebase_todo_test.go

4
pkg/commands/git_commands/rebase.go

@ -369,7 +369,7 @@ func (self *RebaseCommands) MoveTodosDown(commits []*models.Commit) error {
return todoFromCommit(commit)
})
return utils.MoveTodosDown(fileName, todosToMove, self.config.GetCoreCommentChar())
return utils.MoveTodosDown(fileName, todosToMove, true, self.config.GetCoreCommentChar())
}
func (self *RebaseCommands) MoveTodosUp(commits []*models.Commit) error {
@ -378,7 +378,7 @@ func (self *RebaseCommands) MoveTodosUp(commits []*models.Commit) error {
return todoFromCommit(commit)
})
return utils.MoveTodosUp(fileName, todosToMove, self.config.GetCoreCommentChar())
return utils.MoveTodosUp(fileName, todosToMove, true, self.config.GetCoreCommentChar())
}
// SquashAllAboveFixupCommits squashes all fixup! commits above the given one