Allows gpg to run for merge commands #3827
Conversation
jesseduffield
force-pushed
the
GpgMergeOptions
branch
from
be62e89
to
9bfd585
Compare
| runCmd := self.c.Git().Rebase.AddSkipEditorCommand( | ||
| self.c.Git().Rebase.GenericMergeOrRebaseActionCmdObj(commandType, command)) | ||
|
|
||
| var result error = nil |
There was a problem hiding this comment.
| var result error = nil | |
| var result error |
|
|
||
| var result error = nil | ||
| if self.c.Git().Config.UsingGpg() && command != REBASE_OPTION_ABORT { | ||
| result = self.c.RunSubprocessAndRefresh(runCmd) |
There was a problem hiding this comment.
If you're going to run this in a subprocess, you may as well not skip the editor, right? That is, we should only use AddSkipEditorCommand in the else block
There was a problem hiding this comment.
I have just tried your suggestions (latest commit)
It brings up an (external) editor only when using GPG, which is fine.
But this is a different behavior compared to without GPG signing (else block) where it doesn't bring up any editor at all. Which makes sense since we are skipping the editor I guess?
I am fine either way but shouldn't them be behaving the same (i.e. no editor at all) or is the SkipEditorCommand supposed to bring up the lazygit editor?
Neko-Box-Coder
force-pushed
the
GpgMergeOptions
branch
from
bcd21fb
to
5d9a954
Compare
|
Okay, I fixed the obvious ones that caused it to fail the tests. But I can't figure out the tests that are failing now. To me, the changes should behave the same as before because I am just calling the logic in I can replicate the failing tests in sandbox mode but I am not too sure why. I probably need some help/pointers here since I am new to the codebase and golang is not main language |
PR Description
This PR allows GPG to run for merge commands, previously it just hangs if GPG password is required in the CLI.
Please check if the PR fulfills these requirements
go generate ./...)