From 407fbfa6ce93b089a41e245d3d05260eeef27153 Mon Sep 17 00:00:00 2001
From: Diep Pham <me@favadi.com>
Date: Thu, 18 May 2017 12:16:36 +0700
Subject: [PATCH] fixes wrong after field in webhook payload
when merge pull request
---
models/pull.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/models/pull.go b/models/pull.go
index aba104640..64fa51b61 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.HeadBranch)
+ pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.BaseBranch)
if err != nil {
return fmt.Errorf("GetBranchCommit: %v", err)
}