sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

Allow pasting commits more than once

Browse Source 
After pasting commits once, we hide the cherry-picking status (as if it had been
reset), and no longer paint the copied commits with blue hashes; however, we
still allow pasting them again. This can be useful e.g. to backport a bugfix to
multiple major version release branches.
This commit is contained in:
Stefan Haller
2024-10-11 10:40:06 +02:00
parent f473d23d65
commit 85523402d6
3 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/gui/controllers/helpers/cherry_pick_helper.go
View File

@ -57,6 +57,8 @@ func (self *CherryPickHelper) CopyRange(commitsList []*models.Commit, context ty
}
}
self.getData().DidPaste = false
self.rerender()
return nil
}
@ -103,7 +105,8 @@ func (self *CherryPickHelper) Paste() error {
return err
}
if !isInRebase {
return self.Reset()
self.getData().DidPaste = true
self.rerender()
}
return nil
})
@ -114,7 +117,7 @@ func (self *CherryPickHelper) Paste() error {
}
func (self *CherryPickHelper) CanPaste() bool {
return self.getData().Active()
return self.getData().CanPaste()
}
func (self *CherryPickHelper) Reset() error {