Skip to content

The Unified and Autonomous Development Platform

Critical bug fixes relating to pull/push

Robin Shen5e10585bb30f
diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.java
index 52dbb9c523..d81cacf743 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java
@@ -101,6 +101,10 @@ public class GitFilter implements Filter {
String projectPath = StringUtils.strip(projectInfo, "/");
Project project = projectManager.find(projectPath);
+ if (project == null && projectPath.startsWith("projects/")) {
+ projectPath = projectPath.substring("projects/".length());
+ project = projectManager.find(projectPath);
+ }
if (project == null)
throw new GitException(String.format("Unable to find project '%s'", projectPath));
return project;
diff --git a/server-core/src/main/java/io/onedev/server/git/GitSshCommand.java b/server-core/src/main/java/io/onedev/server/git/GitSshCommand.java
index 8c29b0ad87..dae5329a71 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitSshCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitSshCommand.java
@@ -91,8 +91,14 @@ abstract class GitSshCommand implements Command, ServerSessionAware {
SessionManager sessionManager = OneDev.getInstance(SessionManager.class);
sessionManager.openSession();
try {
- String projectPath = StringUtils.stripEnd(command, "'");
- Project project = OneDev.getInstance(ProjectManager.class).find(projectPath);
+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
+ String projectPath = StringUtils.substringAfter(command, "'/");
+ projectPath = StringUtils.substringBefore(projectPath, "'");
+ Project project = projectManager.find(projectPath);
+ if (project == null && projectPath.startsWith("projects/")) {
+ projectPath = projectPath.substring("projects/".length());
+ project = projectManager.find(projectPath);
+ }
if (project == null) {
onExit(-1, "Unable to find project '" + projectPath + "'");
return;