mirror of
https://github.com/go-gitea/gitea.git
synced 2026-08-31 18:19:41 +09:00
fix(process): reap entire process group on cmd.Cancel (#39143)
Signed-off-by: Royce Remer <royceremer@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
co-authored by
wxiaoguang
parent
88974d2db9
commit
eea03676d3
@@ -298,7 +298,7 @@ func verifyCommitSignByGPGSettings(ctx context.Context, gpgSettings *git.CommitS
|
||||
}
|
||||
|
||||
// Otherwise we have to parse the key
|
||||
pubKeyContent, err := gpgSettings.PublicKeyContent()
|
||||
pubKeyContent, err := gpgSettings.PublicKeyContent(ctx)
|
||||
if err != nil {
|
||||
log.Error("gpgSettings.PublicKeyContent: %v", err)
|
||||
return nil
|
||||
@@ -420,7 +420,7 @@ func parseCommitWithSSHSignature(ctx context.Context, c *git.Commit, committerUs
|
||||
|
||||
// Try the configured instance-wide SSH public key
|
||||
if instanceSettings := getInstanceCommitSignSettings(git.SigningKeyFormatSSH); instanceSettings != nil {
|
||||
pubKeyContent, err := instanceSettings.PublicKeyContent()
|
||||
pubKeyContent, err := instanceSettings.PublicKeyContent(ctx)
|
||||
if err != nil {
|
||||
log.Error("commitSignSettings.PublicKeyContent: %v", err)
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user