go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-10-30 23:57:43 +02:00
Code Issues Releases Activity

ignore redundant actions when undoing and redoing

Browse Source
This commit is contained in:
Jesse Duffield
2020-03-25 00:38:22 +11:00
parent d105e2690a
commit 45bba0a3c5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/gui/undoing.go
View File

@@ -63,21 +63,23 @@ func (gui *Gui) parseReflogForActions(onUserAction func(counter int, action refl
action = &reflogAction{kind: COMMIT, from: prevCommitSha, to: reflogCommit.Sha} action = &reflogAction{kind: COMMIT, from: prevCommitSha, to: reflogCommit.Sha}
} else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^rebase -i \(start\)`); ok { } else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^rebase -i \(start\)`); ok {
// if we're here then we must be currently inside an interactive rebase // if we're here then we must be currently inside an interactive rebase
action = &reflogAction{kind: CURRENT_REBASE} action = &reflogAction{kind: CURRENT_REBASE, from: prevCommitSha}
} }
} else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^rebase -i \(start\)`); ok { } else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^rebase -i \(start\)`); ok {
action = &reflogAction{kind: REBASE, from: prevCommitSha, to: rebaseFinishCommitSha} action = &reflogAction{kind: REBASE, from: prevCommitSha, to: rebaseFinishCommitSha}
rebaseFinishCommitSha = ""
} }
if action != nil { if action != nil {
if action.kind != CURRENT_REBASE && action.from == action.to {
// if we're going from one place to the same place we'll ignore the action.
continue
}
ok, err := onUserAction(counter, *action) ok, err := onUserAction(counter, *action)
if ok { if ok {
return err return err
} }
counter-- counter--
if action.kind == REBASE {
rebaseFinishCommitSha = ""
}
} }
} }
return nil return nil