ibnezzoubayr/Atay-Makhzan
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add gpg signing for merge rebase and update by rebase (#36701)

Browse Source 
Fix #36685 

--- 

Generated by a coding agent with Codex 5.2 LLM.
This commit is contained in:
Lunny Xiao
2026-04-05 13:37:35 -07:00
committed by GitHub
parent ca51b4f875
commit e47c6135dd
5 changed files with 67 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/pull/merge_squash.go
+1 -8
View File
@@ -73,14 +73,7 @@ func doMergeStyleSquash(ctx *mergeContext, message string) error {
AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email).
AddOptionFormat("--message=%s", message).
AddArguments("--allow-empty")
if ctx.signKey == nil {
cmdCommit.AddArguments("--no-gpg-sign")
} else {
if ctx.signKey.Format != "" {
cmdCommit.AddConfig("gpg.format", ctx.signKey.Format)
}
cmdCommit.AddOptionFormat("-S%s", ctx.signKey.KeyID)
}
addCommitSigningOptions(cmdCommit, ctx.signKey)
if err := ctx.PrepareGitCmd(cmdCommit).RunWithStderr(ctx); err != nil {
log.Error("git commit %-v: %v\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), err.Stderr())
return fmt.Errorf("git commit [%s:%s -> %s:%s]: %w\n%s\n%s", ctx.pr.HeadRepo.FullName(), ctx.pr.HeadBranch, ctx.pr.BaseRepo.FullName(), ctx.pr.BaseBranch, err, ctx.outbuf.String(), err.Stderr())