diff options
| -rw-r--r-- | pkg/commands/git_commands/rebase.go | 2 | ||||
| -rw-r--r-- | pkg/gui/controllers/local_commits_controller.go | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkg/commands/git_commands/rebase.go b/pkg/commands/git_commands/rebase.go index cffc5d68a..5828ffbaa 100644 --- a/pkg/commands/git_commands/rebase.go +++ b/pkg/commands/git_commands/rebase.go @@ -79,7 +79,7 @@ func (self *RebaseCommands) SetCommitAuthor(commits []*models.Commit, index int, } func (self *RebaseCommands) GenericAmend(commits []*models.Commit, index int, f func() error) error { - if index == 0 { + if models.IsHeadCommit(commits, index) { // we've selected the top commit so no rebase is required return f() } diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go index 4610aed12..35e314357 100644 --- a/pkg/gui/controllers/local_commits_controller.go +++ b/pkg/gui/controllers/local_commits_controller.go @@ -474,6 +474,10 @@ func (self *LocalCommitsController) amendTo(commit *models.Commit) error { } func (self *LocalCommitsController) amendAttribute(commit *models.Commit) error { + if self.git.Status.WorkingTreeState() != enums.REBASE_MODE_NONE && !self.isHeadCommit() { + return self.c.ErrorMsg(self.c.Tr.AlreadyRebasing) + } + return self.c.Menu(types.CreateMenuOptions{ Title: "Amend commit attribute", Items: []*types.MenuItem{ |