From eeebb1b59fac231d6370d70abd3d7c638bfcd908 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 19 Apr 2015 17:25:13 -0700 Subject: [PATCH] Added the 'sha' parameter. Fixes issue #176 --- .../java/org/kohsuke/github/GHPullRequest.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/kohsuke/github/GHPullRequest.java b/src/main/java/org/kohsuke/github/GHPullRequest.java index 3d25a4f5a..909110b72 100644 --- a/src/main/java/org/kohsuke/github/GHPullRequest.java +++ b/src/main/java/org/kohsuke/github/GHPullRequest.java @@ -266,7 +266,21 @@ public class GHPullRequest extends GHIssue { * Commit message. If null, the default one will be used. */ public void merge(String msg) throws IOException { - new Requester(root).method("PUT").with("commit_message",msg).to(getApiRoute()+"/merge"); + merge(msg,null); + } + + /** + * Merge this pull request. + * + * The equivalent of the big green "Merge pull request" button. + * + * @param msg + * Commit message. If null, the default one will be used. + * @param sha + * SHA that pull request head must match to allow merge. + */ + public void merge(String msg, String sha) throws IOException { + new Requester(root).method("PUT").with("commit_message",msg).with("sha",sha).to(getApiRoute()+"/merge"); } private void fetchIssue() throws IOException {