go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-27 00:51:18 +02:00
Code Issues Releases Activity

Move selection down by one after creating a fixup commit

Browse Source
This commit is contained in:
Stefan Haller
2023-08-22 16:35:30 +02:00
parent dfb45ba893
commit 3e3b902228
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/gui/controllers/local_commits_controller.go
View File

@ -811,11 +811,14 @@ func (self *LocalCommitsController) createFixupCommit(commit *models.Commit) err
HandleConfirm: func() error { HandleConfirm: func() error {
return self.c.Helpers().WorkingTree.WithEnsureCommitableFiles(func() error { return self.c.Helpers().WorkingTree.WithEnsureCommitableFiles(func() error {
self.c.LogAction(self.c.Tr.Actions.CreateFixupCommit) self.c.LogAction(self.c.Tr.Actions.CreateFixupCommit)
if err := self.c.Git().Commit.CreateFixupCommit(commit.Sha); err != nil { return self.c.WithWaitingStatusSync(self.c.Tr.CreatingFixupCommitStatus, func() error {
return self.c.Error(err) if err := self.c.Git().Commit.CreateFixupCommit(commit.Sha); err != nil {
} return self.c.Error(err)
}
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) self.context().MoveSelectedLine(1)
return self.c.Refresh(types.RefreshOptions{Mode: types.SYNC})
})
}) })
}, },
}) })

2
pkg/i18n/english.go
View File

@ -341,6 +341,7 @@ type TranslationSet struct {
CheckingOutStatus string CheckingOutStatus string
CommittingStatus string CommittingStatus string
RevertingStatus string RevertingStatus string
CreatingFixupCommitStatus string
CommitFiles string CommitFiles string
SubCommitsDynamicTitle string SubCommitsDynamicTitle string
CommitFilesDynamicTitle string CommitFilesDynamicTitle string
@ -1289,6 +1290,7 @@ func EnglishTranslationSet() TranslationSet {
CheckingOutStatus: "Checking out", CheckingOutStatus: "Checking out",
CommittingStatus: "Committing", CommittingStatus: "Committing",
RevertingStatus: "Reverting", RevertingStatus: "Reverting",
CreatingFixupCommitStatus: "Creating fixup commit",
CommitFiles: "Commit files", CommitFiles: "Commit files",
SubCommitsDynamicTitle: "Commits (%s)", SubCommitsDynamicTitle: "Commits (%s)",
CommitFilesDynamicTitle: "Diff files (%s)", CommitFilesDynamicTitle: "Diff files (%s)",

5
pkg/integration/tests/interactive_rebase/squash_fixups_above.go
View File

@ -33,11 +33,10 @@ var SquashFixupsAbove = NewIntegrationTest(NewIntegrationTestArgs{
}). }).
Lines( Lines(
Contains("fixup! commit 02"), Contains("fixup! commit 02"),
Contains("commit 03").IsSelected(), // wrong, we want the next line Contains("commit 03"),
Contains("commit 02"), Contains("commit 02").IsSelected(),
Contains("commit 01"), Contains("commit 01"),
). ).
SelectNextItem().
Press(keys.Commits.SquashAboveCommits). Press(keys.Commits.SquashAboveCommits).
Tap(func() { Tap(func() {
t.ExpectPopup().Menu(). t.ExpectPopup().Menu().