diff options
| author | Unknwon <u@gogs.io> | 2018-06-26 21:16:29 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2018-06-26 21:16:29 +0800 |
| commit | f6bdefe3f3937e1434b9692822e0ff6f599df758 (patch) | |
| tree | 88e39cec24a63fb147886ecb715b1c3c684f3f0d /models | |
| parent | cd71077c6acb52bf564ede19cf480fddfad72c05 (diff) | |
public: minor fix for PR #5276
Diffstat (limited to 'models')
| -rw-r--r-- | models/pull.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/models/pull.go b/models/pull.go index 1d54d082..9dd8737f 100644 --- a/models/pull.go +++ b/models/pull.go @@ -193,7 +193,7 @@ const ( // Merge merges pull request to base repository. // FIXME: add repoWorkingPull make sure two merges does not happen at same time. -func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle MergeStyle, CommitDescription string) (err error) { +func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle MergeStyle, commitDescription string) (err error) { defer func() { go HookQueue.Add(pr.BaseRepo.ID) go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false) @@ -267,7 +267,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle fmt.Sprintf("PullRequest.Merge (git merge): %s", tmpBasePath), "git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.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 { + "-m", commitDescription); err != nil { return fmt.Errorf("git commit [%s]: %v - %s", tmpBasePath, err, stderr) } |