The Unified and Autonomous Development Platform
fix issue #165 - Fast forward merge doesn't work
Robin Shenba55906d6bb4
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.javaindex 912d01d6ed..6aab95cc81 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java@@ -81,12 +81,16 @@ public abstract class MergeConfirmPanel extends OperationConfirmPanel {}public String getCommitMessage() {- StringBuilder builder = new StringBuilder(bean.getSummary());- if (bean.getBody() != null) {- builder.append("\n\n");- builder.append(bean.getBody());+ if (bean.getSummary() != null) {+ StringBuilder builder = new StringBuilder(bean.getSummary());+ if (bean.getBody() != null) {+ builder.append("\n\n");+ builder.append(bean.getBody());+ }+ return builder.toString();+ } else {+ return null;}- return builder.toString();}@Override