diff options
| author | Lauris BH <lauris@nix.lv> | 2017-06-19 12:37:11 +0300 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-06-19 17:37:11 +0800 |
| commit | 165cf337714769ab79c5fe845f291e56c8243475 (patch) | |
| tree | 268c614135d5b4dbbc2ad79b64d141582eec2c2a /models/pull.go | |
| parent | 4d2ea7dc41f2a09f0b9b5833b18bc07a81490e4b (diff) | |
| download | gitea-165cf337714769ab79c5fe845f291e56c8243475.tar.gz gitea-165cf337714769ab79c5fe845f291e56c8243475.zip | |
Wrong PR merge commit ID saved (#2007)
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index 7a636c3c8c..b5b63bebf1 100644 --- a/models/pull.go +++ b/models/pull.go @@ -328,7 +328,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error return fmt.Errorf("git push: %s", stderr) } - pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.BaseBranch) + pr.MergedCommitID, err = baseGitRepo.GetBranchCommitID(pr.BaseBranch) if err != nil { return fmt.Errorf("GetBranchCommit: %v", err) } |