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

Allow rewording the head commit during interactive rebase

Browse Source
This commit is contained in:
Stefan Haller
2023-03-03 19:53:15 +01:00
parent 605bc026a1
commit b24955063c
6 changed files with 106 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/git_commands/rebase.go
View File

@ -34,7 +34,7 @@ func NewRebaseCommands(
}
func (self *RebaseCommands) RewordCommit(commits []*models.Commit, index int, message string) error {
if index == 0 {
if models.IsHeadCommit(commits, index) {
// we've selected the top commit so no rebase is required
return self.commit.RewordLastCommit(message)
}

4
pkg/commands/models/commit.go
View File

@ -65,3 +65,7 @@ func (c *Commit) IsMerge() bool {
func (c *Commit) IsTODO() bool {
return c.Action != ""
}
func IsHeadCommit(commits []*Commit, index int) bool {
return !commits[index].IsTODO() && (index == 0 || commits[index-1].IsTODO())
}