Cleanup CommitTreeOpts

Author: ChristopherHX

modules/git/repo_tree.go

@@ -15,8 +15,7 @@ import (
 type CommitTreeOpts struct {
 	Parents    []string
 	Message    string
-	KeyID      string
-	KeyFormat  string
+	Key        SigningKey
 	NoGPGSign  bool
 	AlwaysSign bool
 }
@@ -44,11 +43,11 @@ func (repo *Repository) CommitTree(author, committer *Signature, tree *Tree, opt
 	_, _ = messageBytes.WriteString(opts.Message)
 	_, _ = messageBytes.WriteString("\n")
 
-	if opts.KeyID != "" || opts.AlwaysSign {
-		if opts.KeyFormat != "" {
-			cmd.AddConfig("gpg.format", opts.KeyFormat)
+	if opts.Key.KeyID != "" || opts.AlwaysSign {
+		if opts.Key.Format != "" {
+			cmd.AddConfig("gpg.format", opts.Key.Format)
 		}
-		cmd.AddOptionFormat("-S%s", opts.KeyID)
+		cmd.AddOptionFormat("-S%s", opts.Key.KeyID)
 	}
 
 	if opts.NoGPGSign {

services/wiki/wiki.go

@@ -194,8 +194,7 @@ func updateWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model
 
 	sign, signingKey, signer, _ := asymkey_service.SignWikiCommit(ctx, repo, doer)
 	if sign {
-		commitTreeOpts.KeyID = signingKey.KeyID
-		commitTreeOpts.KeyFormat = signingKey.Format
+		commitTreeOpts.Key = signingKey
 		if repo.GetTrustModel() == repo_model.CommitterTrustModel || repo.GetTrustModel() == repo_model.CollaboratorCommitterTrustModel {
 			committer = signer
 		}
@@ -317,8 +316,7 @@ func DeleteWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model
 
 	sign, signingKey, signer, _ := asymkey_service.SignWikiCommit(ctx, repo, doer)
 	if sign {
-		commitTreeOpts.KeyID = signingKey.KeyID
-		commitTreeOpts.KeyFormat = signingKey.Format
+		commitTreeOpts.Key = signingKey
 		if repo.GetTrustModel() == repo_model.CommitterTrustModel || repo.GetTrustModel() == repo_model.CollaboratorCommitterTrustModel {
 			committer = signer
 		}