Skip to content

The Unified and Autonomous Development Platform

Fix issue #737 - Input a invalid commit when create branch results in NPE

Robin Shen472c5e413532
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
index e0fcc00d02..b26b5f0a48 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
@@ -278,11 +278,11 @@ public abstract class RevisionSelector extends Panel {
Project project = projectModel.getObject();
try {
User user = SecurityUtils.getUser();
- RevCommit commit = project.getRevCommit(revision, true);
if (project.getRepository().resolve(revInput) != null) {
itemValues.add(COMMIT_FLAG + revInput);
} else if (branchesActive) {
if (canCreateBranch) {
+ RevCommit commit = project.getRevCommit(revision, true);
if (SecurityUtils.canCreateBranch(project, revInput)
&& project.isCommitSignatureRequirementSatisfied(user, revInput, commit)) {
itemValues.add(ADD_FLAG + revInput);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css
index b0e5da6253..5bb6cf83a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css
@@ -4,6 +4,9 @@
.revision-selector input+.icon {
margin-left: -1.8rem;
}
+.revision-selector input {
+ padding-right: 2rem;
+}
.revision-selector .items {
margin-bottom: 0;
/*