diff options
Diffstat (limited to 'internal/db/pull.go')
| -rw-r--r-- | internal/db/pull.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/internal/db/pull.go b/internal/db/pull.go index 11298e0c..e2f55361 100644 --- a/internal/db/pull.go +++ b/internal/db/pull.go @@ -270,10 +270,9 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle } // Create a merge commit for the base branch. - sig := doer.NewGitSig() if _, stderr, err = process.ExecDir(-1, tmpBasePath, fmt.Sprintf("PullRequest.Merge (git merge): %s", tmpBasePath), - "git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email), + "git", "commit", fmt.Sprintf("--author='%s <%s>'", doer.DisplayName(), doer.Email), "-m", fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.HeadUserName, pr.HeadRepo.Name, pr.BaseBranch), "-m", commitDescription); err != nil { return fmt.Errorf("git commit [%s]: %v - %s", tmpBasePath, err, stderr) |