mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 20:36:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: Rename UsingGpg to make room for Gpg Tag logic

Browse source
This commit is contained in:
Chris McDonnell 2025-03-13 23:59:19 -04:00 • committed by Stefan Haller
parent 67b0db0bd8
commit 52da806c57
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkg/commands/git_commands/config.go
View file

@ -57,9 +57,10 @@ func (self *ConfigCommands) GetPager(width int) string {
return utils.ResolvePlaceholderString(pagerTemplate, templateValues)
}
// UsingGpg tells us whether the user has gpg enabled so that we can know
// whether we need to run a subprocess to allow them to enter their password
func (self *ConfigCommands) UsingGpg() bool {
// NeedsGpgSubprocessForCommit tells us whether the user has gpg enabled for commit actions
// and needs a subprocess because they have a process where they manually
// enter their password every time a GPG action is taken
func (self *ConfigCommands) NeedsGpgSubprocessForCommit() bool {
overrideGpg := self.UserConfig().Git.OverrideGpg
if overrideGpg {
return false

2
pkg/commands/git_commands/patch.go
View file

@ -150,7 +150,7 @@ func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, s
// we can make this GPG thing possible it just means we need to do this in two parts:
// one where we handle the possibility of a credential request, and the other
// where we continue the rebase
if self.config.UsingGpg() {
if self.config.NeedsGpgSubprocessForCommit() {
return errors.New(self.Tr.DisabledForGPG)
}

4
pkg/commands/git_commands/rebase.go
View file

@ -35,7 +35,7 @@ func NewRebaseCommands(
}
func (self *RebaseCommands) RewordCommit(commits []*models.Commit, index int, summary string, description string) error {
if self.config.UsingGpg() {
if self.config.NeedsGpgSubprocessForCommit() {
return errors.New(self.Tr.DisabledForGPG)
}
@ -413,7 +413,7 @@ func (self *RebaseCommands) BeginInteractiveRebaseForCommitRange(
// we can make this GPG thing possible it just means we need to do this in two parts:
// one where we handle the possibility of a credential request, and the other
// where we continue the rebase
if self.config.UsingGpg() {
if self.config.NeedsGpgSubprocessForCommit() {
return errors.New(self.Tr.DisabledForGPG)
}

2
pkg/gui/controllers/helpers/gpg_helper.go
View file

@ -23,7 +23,7 @@ func NewGpgHelper(c *HelperCommon) *GpgHelper {
// fix this bug, or just stop running subprocesses from within there, given that
// we don't need to see a loading status if we're in a subprocess.
func (self *GpgHelper) WithGpgHandling(cmdObj oscommands.ICmdObj, waitingStatus string, onSuccess func() error) error {
useSubprocess := self.c.Git().Config.UsingGpg()
useSubprocess := self.c.Git().Config.NeedsGpgSubprocessForCommit()
if useSubprocess {
success, err := self.c.RunSubprocess(cmdObj)
if success && onSuccess != nil {