diff --git a/knotserver/config/config.go b/knotserver/config/config.go --- a/knotserver/config/config.go +++ b/knotserver/config/config.go @@ -29,8 +29,8 @@ } type Git struct { // user name & email used as committer - UserName string `env:"USER_NAME, default=Tangled"` - UserEmail string `env:"USER_EMAIL, default=noreply@tangled.sh"` + UserName string `env:"USER_NAME, default=Tangled"` + UserEmail string `env:"USER_EMAIL, default=noreply@tangled.sh"` } func (s Server) Did() syntax.DID { diff --git a/knotserver/xrpc/merge.go b/knotserver/xrpc/merge.go --- a/knotserver/xrpc/merge.go +++ b/knotserver/xrpc/merge.go @@ -81,7 +81,7 @@ if data.CommitMessage != nil { mo.CommitMessage = *data.CommitMessage } - mo.CommitterName = x.Config.Git.UserName + mo.CommitterName = x.Config.Git.UserName mo.CommitterEmail = x.Config.Git.UserEmail mo.FormatPatch = patchutil.IsFormatPatch(data.Patch)