back interdiff of round #2 and #1

knotserver: git/merge: remove GitRepo.Merge #528

merged
opened by boltless.me targeting master from boltless.me/core: push-skprtmnmwuqn
options
unified split
files
knotserver
git
merge.go
routes.go
xrpc
merge.go
ERROR
knotserver/git/merge.go

Failed to calculate interdiff for this file.

REVERTED
knotserver/routes.go
··· 977 977 return 978 978 } 979 979 980 + mo := &git.MergeOptions{ 981 + AuthorName: data.AuthorName, 982 + AuthorEmail: data.AuthorEmail, 983 + CommitBody: data.CommitBody, 984 + CommitMessage: data.CommitMessage, 985 + } 986 + 980 987 patch := data.Patch 981 988 branch := data.Branch 982 989 gr, err := git.Open(path, branch) ··· 985 992 return 986 993 } 987 994 995 + mo.FormatPatch = patchutil.IsFormatPatch(patch) 988 - mo := git.MergeOptions{ 989 - AuthorName: data.AuthorName, 990 - AuthorEmail: data.AuthorEmail, 991 - CommitBody: data.CommitBody, 992 - CommitMessage: data.CommitMessage, 993 - FormatPatch: patchutil.IsFormatPatch(patch), 994 - } 995 996 996 997 if err := gr.MergeWithOptions([]byte(patch), branch, mo); err != nil { 997 998 var mergeErr *git.ErrMerge
NEW
knotserver/xrpc/merge.go
··· 67 67 return 68 68 } 69 69 70 - mo := &git.MergeOptions{} 70 + mo := git.MergeOptions{} 71 71 if data.AuthorName != nil { 72 72 mo.AuthorName = *data.AuthorName 73 73 }