commit edd60475c5baca2a8f15c3c24165939c9826c95f
author Luca Milanesio <luca.milanesio@gmail.com> Sun Nov 04 21:18:38 2018 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Sun Nov 04 21:18:38 2018 +0000
tree b81b4edbb2cb68eff60cfc69c26f4f93d830c4a5
parent d0063d6c10ccf6b7f7c9d53bf5ba740b843b5393

Fix PR reference URL and body

Use the human-readable GitHub PR URL
when creating the Gerrit Change and keep the
original PR body formatting.

Change-Id: Ib9ec6255b6a3f20af1495a703441705b07bfb1ee

github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java

diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java
index 646737e..601e438 100644
--- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java
+++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java
@@ -234,11 +234,11 @@
 
   private String getChangeMessage(GHPullRequest pr) {
     return "GitHub Pull Request: "
-        + pr.getUrl()
+        + pr.getHtmlUrl()
         + "\n\n"
         + pr.getTitle()
         + "\n\n"
-        + pr.getBody().replaceAll("\n", "\n\n");
+        + pr.getBody();
   }
 
   private void exitWhenCancelled() throws JobCancelledException {