summaryrefslogtreecommitdiffstats
path: root/pkg/gui/controllers/local_commits_controller.go
diff options
context:
space:
mode:
authorStefan Haller <stefan@haller-berlin.de>2023-03-03 19:53:15 +0100
committerStefan Haller <stefan@haller-berlin.de>2023-04-01 08:16:15 +0200
commitb24955063c71f6cb600be8636564144c496fe46a (patch)
treef69ccb28990bca1916464349a7b7459062317ba3 /pkg/gui/controllers/local_commits_controller.go
parent605bc026a1512d2fddc42fb8f23b9dc1c60440e5 (diff)
Allow rewording the head commit during interactive rebase
Diffstat (limited to 'pkg/gui/controllers/local_commits_controller.go')
-rw-r--r--pkg/gui/controllers/local_commits_controller.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go
index 175c0ea47..904dbfd33 100644
--- a/pkg/gui/controllers/local_commits_controller.go
+++ b/pkg/gui/controllers/local_commits_controller.go
@@ -229,7 +229,7 @@ func (self *LocalCommitsController) reword(commit *models.Commit) error {
func (self *LocalCommitsController) doRewordEditor() error {
self.c.LogAction(self.c.Tr.Actions.RewordCommit)
- if self.context().GetSelectedLineIdx() == 0 {
+ if self.isHeadCommit() {
return self.c.RunSubprocessAndRefresh(self.os.Cmd.New("git commit --allow-empty --amend --only"))
}
@@ -728,3 +728,7 @@ func (self *LocalCommitsController) context() *context.LocalCommitsContext {
func (self *LocalCommitsController) paste() error {
return self.helpers.CherryPick.Paste()
}
+
+func (self *LocalCommitsController) isHeadCommit() bool {
+ return models.IsHeadCommit(self.model.Commits, self.context().GetSelectedLineIdx())
+}