fixes wrong after field in webhook payload (#1746)

go-gitea · May 19, 2017 · 977dcf9 · 977dcf9
2 parents 281a038 + 407fbfa
commit 977dcf9
Showing 1 changed file with 1 addition and 1 deletion.
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)
 	}