From 165cf337714769ab79c5fe845f291e56c8243475 Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Mon, 19 Jun 2017 12:37:11 +0300 Subject: [PATCH] Wrong PR merge commit ID saved (#2007) --- models/pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) }