sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Add rebase from marked base commit test

Browse Source 
This also fixes a bug where after the rebase each commit in the commits view had a tick against it because we hadn't
refreshed the view since the base commit was no longer marked
This commit is contained in:
Jesse Duffield
2023-08-12 13:17:01 +10:00
parent 3ea81d4a6f
commit f1753f36c8
7 changed files with 385 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/gui/controllers/helpers/merge_and_rebase_helper.go
View File

@ -235,7 +235,7 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error {
}
err = self.CheckMergeOrRebase(err)
if err == nil {
self.c.Modes().MarkedBaseCommit.Reset()
return self.ResetMarkedBaseCommit()
}
return err
})
@ -257,7 +257,9 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error {
if err = self.CheckMergeOrRebase(err); err != nil {
return err
}
self.c.Modes().MarkedBaseCommit.Reset()
if err = self.ResetMarkedBaseCommit(); err != nil {
return err
}
return self.c.PushContext(self.c.Contexts().LocalCommits)
},
},