jw238/simplegit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set identity for temporary repository merges

Browse Source
This commit is contained in:
Jabberwocky238
2026-07-30 02:53:21 -04:00
parent 3129660c9e
commit b321bf533f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gitcmd/merge_temprepo.go
+9 -2
View File
@@ -56,9 +56,16 @@ func (r *Repository) MergeViaTempRepo(base, head, message, authorName, authorEma
return nil, err return nil, err
} }
defer cleanup() defer cleanup()
identityEnv := []string{
"GIT_AUTHOR_NAME=" + authorName,
"GIT_AUTHOR_EMAIL=" + authorEmail,
"GIT_COMMITTER_NAME=" + authorName,
"GIT_COMMITTER_EMAIL=" + authorEmail,
}
if !noFF && r.isAncestor(baseSHA, headSHA) { if !noFF && r.isAncestor(baseSHA, headSHA) {
stdout, stderr, err := NewCommand("merge", "--ff-only").AddDynamicArguments(headSHA).WithDir(temp).RunStdString(r.ctx) stdout, stderr, err := NewCommand("merge", "--ff-only").AddDynamicArguments(headSHA).
WithDir(temp).WithEnv(identityEnv...).RunStdString(r.ctx)
if err != nil { if err != nil {
return nil, commandFailure("merge --ff-only", err, stdout, stderr) return nil, commandFailure("merge --ff-only", err, stdout, stderr)
} }
@@ -73,7 +80,7 @@ func (r *Repository) MergeViaTempRepo(base, head, message, authorName, authorEma
} }
mergeOut, mergeErrOut, mergeErr := NewCommand("merge", "--no-ff", "--no-commit"). mergeOut, mergeErrOut, mergeErr := NewCommand("merge", "--no-ff", "--no-commit").
AddDynamicArguments(headSHA).WithDir(temp).RunStdString(r.ctx) AddDynamicArguments(headSHA).WithDir(temp).WithEnv(identityEnv...).RunStdString(r.ctx)
if mergeErr != nil { if mergeErr != nil {
conflicts, err := r.unmergedPaths(temp) conflicts, err := r.unmergedPaths(temp)
if err != nil { if err != nil {