From bafddf4bafc9f897f2c0dbb9d4e42de244e08ead Mon Sep 17 00:00:00 2001
From: Manuel Recena <mrecena@cloudbees.com>
Date: Sat, 14 Nov 2015 12:11:24 +0100
Subject: [PATCH] Initial source code modifications

---
 src/main/java/org/kohsuke/github/GHPullRequest.java  | 12 +++++++++---
 .../java/org/kohsuke/github/PullRequestTest.java     |  9 +++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/kohsuke/github/GHPullRequest.java b/src/main/java/org/kohsuke/github/GHPullRequest.java
index 909110b72..42cc38992 100644
--- a/src/main/java/org/kohsuke/github/GHPullRequest.java
+++ b/src/main/java/org/kohsuke/github/GHPullRequest.java
@@ -50,6 +50,7 @@ public class GHPullRequest extends GHIssue {
     private int deletions;
     private String mergeable_state;
     private int changed_files;
+    private String merge_commit_sha;
 
     /**
      * GitHub doesn't return some properties of {@link GHIssue} when requesting the GET on the 'pulls' API
@@ -142,9 +143,9 @@ public class GHPullRequest extends GHIssue {
     }
 
     //
-// details that are only available via get with ID
-//
-//
+    // details that are only available via get with ID
+    //
+
     public GHUser getMergedBy() throws IOException {
         populate();
         return merged_by;
@@ -185,6 +186,11 @@ public class GHPullRequest extends GHIssue {
         return changed_files;
     }
 
+    public String getMergeCommitSha() throws IOException {
+        populate();
+        return merge_commit_sha;
+    }
+
     /**
      * Fully populate the data by retrieving missing data.
      *
diff --git a/src/test/java/org/kohsuke/github/PullRequestTest.java b/src/test/java/org/kohsuke/github/PullRequestTest.java
index 9fc55f751..9ef582cb7 100644
--- a/src/test/java/org/kohsuke/github/PullRequestTest.java
+++ b/src/test/java/org/kohsuke/github/PullRequestTest.java
@@ -49,6 +49,15 @@ public class PullRequestTest extends AbstractGitHubApiTestBase {
         assertTrue(comments.isEmpty());
     }
 
+    @Test
+    public void testMergeCommitSHA() throws Exception {
+        String name = rnd.next();
+        GHRepository repo = gitHub.getMyself().getRepository("website");
+        GHPullRequest p = repo.createPullRequest(name, "feature5", "master", "## test");
+        GHRef ref = repo.getRef("pull/" + p.getNumber() + "/merge");
+        assertTrue(ref.getObject().getSha() == p.getMergeCommitSha());
+    }
+
     @Test
     // Requires push access to the test repo to pass
     public void setLabels() throws Exception {