]> source.dussan.org Git - gitea.git/commitdiff
fixes wrong after field in webhook payload 1746/head
authorDiep Pham <me@favadi.com>
Thu, 18 May 2017 05:16:36 +0000 (12:16 +0700)
committerDiep Pham <me@favadi.com>
Thu, 18 May 2017 05:16:36 +0000 (12:16 +0700)
when merge pull request

models/pull.go

index aba1046402eda13a55e3fbecaac0b00316dcb994..64fa51b61b01e466a77f6bc875eabfd6c4113b9e 100644 (file)
@@ -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.HeadBranch)
+       pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.BaseBranch)
        if err != nil {
                return fmt.Errorf("GetBranchCommit: %v", err)
        }