summaryrefslogtreecommitdiffstats
path: root/pkg/gui
diff options
context:
space:
mode:
authorLuka Markušić <luka.markusic@microblink.com>2022-09-15 17:35:33 +0200
committerStefan Haller <stefan@haller-berlin.de>2023-04-01 08:16:15 +0200
commite7d0116312ff3233ff19bc3b355e7cb5f7b570ac (patch)
tree33a5596982a5beac5f2c444d505bad38db3bde4f /pkg/gui
parent85fdb700ba9fd69393f1e7ee572cc6b0d741aaf5 (diff)
Allow amending the head commit during interactive rebase
Diffstat (limited to 'pkg/gui')
-rw-r--r--pkg/gui/controllers/local_commits_controller.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go
index 348e0e73f..355e18b82 100644
--- a/pkg/gui/controllers/local_commits_controller.go
+++ b/pkg/gui/controllers/local_commits_controller.go
@@ -445,6 +445,13 @@ func (self *LocalCommitsController) moveUp(commit *models.Commit) error {
}
func (self *LocalCommitsController) amendTo(commit *models.Commit) error {
+ if self.isHeadCommit() {
+ if err := self.helpers.AmendHelper.AmendHead(); err != nil {
+ return err
+ }
+ return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
+ }
+
return self.c.Confirm(types.ConfirmOpts{
Title: self.c.Tr.AmendCommitTitle,
Prompt: self.c.Tr.AmendCommitPrompt,