fixes wrong after field in webhook payload (#1746)

bkcsoft · web-flow · commit 977dcf96e0d9 · 2017-05-19T12:12:27.000+02:00
diff --git 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.HeadBranch)
+	pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.BaseBranch)
 	if err != nil {
 		return fmt.Errorf("GetBranchCommit: %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ func (pr PullRequest) Merge(doer User, baseGitRepo *git.Repository) (err error`
`328`	`328`	`return fmt.Errorf("git push: %s", stderr)`
`329`	`329`	`}`
`330`	`330`
`331`		`- pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.HeadBranch)`
	`331`	`+ pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.BaseBranch)`
`332`	`332`	`if err != nil {`
`333`	`333`	`return fmt.Errorf("GetBranchCommit: %v", err)`
`334`	`334`	`}`