back interdiff of round #4 and #3

knotserver: set default git committer user via config #529

merged
opened by boltless.me targeting master from boltless.me/core: push-skprtmnmwuqn

Introducing KNOT_GIT_USER_NAME and KNOT_GIT_USER_EMAIL environment variables.

This will prevent silently inheritting global gitconfig's user

Signed-off-by: Seongmin Lee boltlessengineer@proton.me

options
unified split
files
knotserver
config
config.go
git
merge.go
routes.go
xrpc
merge.go
ERROR
knotserver/config/config.go

Failed to calculate interdiff for this file.

ERROR
knotserver/git/merge.go

Failed to calculate interdiff for this file.

REVERTED
knotserver/routes.go
··· 986 986 } 987 987 988 988 mo := git.MergeOptions{ 989 + AuthorName: data.AuthorName, 990 + AuthorEmail: data.AuthorEmail, 991 + CommitBody: data.CommitBody, 992 + CommitMessage: data.CommitMessage, 989 - AuthorName: data.AuthorName, 990 - AuthorEmail: data.AuthorEmail, 991 - CommitterName: h.c.Git.UserName, 992 - CommitterEmail: h.c.Git.UserEmail, 993 - CommitBody: data.CommitBody, 994 - CommitMessage: data.CommitMessage, 995 993 FormatPatch: patchutil.IsFormatPatch(patch), 996 994 } 997 995
NEW
knotserver/xrpc/merge.go
··· 81 81 mo.CommitMessage = *data.CommitMessage 82 82 } 83 83 84 + mo.CommitterName = x.Config.Git.UserName 85 + mo.CommitterEmail = x.Config.Git.UserEmail 84 86 mo.FormatPatch = patchutil.IsFormatPatch(data.Patch) 85 87 86 88 err = gr.MergeWithOptions([]byte(data.Patch), data.Branch, mo)