diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-04-29 12:44:14 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-29 12:44:14 +1000 |
| commit | aa70723e3a7211c01ccfb78c710dbf7808037c6c (patch) | |
| tree | 0c9adc5e1e893762e5c724597699cff0b37f223e /pkg/gui/controllers | |
| parent | 7db54a948a3247fe7c5d4feadfb27837bd073859 (diff) | |
| parent | 21072226d24bf8e2cd9dbd2085b969303a1797eb (diff) | |
Merge pull request #2558 from stefanhaller/allow-resetting-author-during-rebase
Diffstat (limited to 'pkg/gui/controllers')
| -rw-r--r-- | pkg/gui/controllers/local_commits_controller.go | 4 |
1 files changed, 4 insertions, 0 deletions
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{ |