sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Make moving todo commits more robust

Browse Source
This commit is contained in:
Stefan Haller
2023-04-04 10:23:50 +02:00
parent 120dd1530a
commit dc4e88f8a4
6 changed files with 415 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/controllers/local_commits_controller.go
View File

@ -382,7 +382,7 @@ func (self *LocalCommitsController) moveDown(commit *models.Commit) error {
self.c.LogAction(self.c.Tr.Actions.MoveCommitDown)
self.c.LogCommand(fmt.Sprintf("Moving commit %s down", commit.ShortSha()), false)
if err := self.git.Rebase.MoveTodoDown(index); err != nil {
if err := self.git.Rebase.MoveTodoDown(commit); err != nil {
return self.c.Error(err)
}
self.context().MoveSelectedLine(1)
@ -420,7 +420,7 @@ func (self *LocalCommitsController) moveUp(commit *models.Commit) error {
false,
)
if err := self.git.Rebase.MoveTodoDown(index - 1); err != nil {
if err := self.git.Rebase.MoveTodoUp(self.model.Commits[index]); err != nil {
return self.c.Error(err)
}
self.context().MoveSelectedLine(-1)