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

select current bisect commit even if bisect was started on another branch

Browse Source
This commit is contained in:
Jesse Duffield
2022-01-26 19:12:44 +11:00
parent ebbdf829e7
commit 5a3f81d1f7
125 changed files with 206 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/commands/git_commands/bisect.go
View File

@ -163,9 +163,12 @@ func (self *BisectCommands) IsDone() (bool, []string, error) {
return done, candidates, nil
}
func (self *BisectCommands) ReachableFromStart(ref string, startRef string) bool {
// tells us whether the 'start' ref that we'll be sent back to after we're done
// bisecting is actually a descendant of our current bisect commit. If it's not, we need to
// render the commits from the bad commit.
func (self *BisectCommands) ReachableFromStart(bisectInfo *BisectInfo) bool {
err := self.cmd.New(
fmt.Sprintf("git merge-base --is-ancestor %s %s", startRef, ref),
fmt.Sprintf("git merge-base --is-ancestor %s %s", bisectInfo.GetNewSha(), bisectInfo.GetStartSha()),
).DontLog().Run()
return err == nil