opendev/gerrit
Code Issues Proposed changes

Merge "Prevent "test.git.git" turning into "test.git" in the Changes table."

Browse Source
This commit is contained in:
Shawn Pearce
2013-08-21 04:18:40 +00:00
committed by Gerrit Code Review
parent 3fe44e489d 59bc7c962b
commit b398967644
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
View File

@@ -164,11 +164,24 @@ public class LocalDiskRepositoryManager implements GitRepositoryManager {
// on disk; for instance when the project has been created directly on the // on disk; for instance when the project has been created directly on the
// file-system through replication. // file-system through replication.
// //
if (!name.get().endsWith(Constants.DOT_GIT_EXT)) {
if (FileKey.resolve(gitDirOf(name), FS.DETECTED) != null) { if (FileKey.resolve(gitDirOf(name), FS.DETECTED) != null) {
onCreateProject(name); onCreateProject(name);
} else { } else {
throw new RepositoryNotFoundException(gitDirOf(name)); throw new RepositoryNotFoundException(gitDirOf(name));
} }
} else {
final File directory = gitDirOf(name);
if (FileKey.isGitRepository(new File(directory, Constants.DOT_GIT),
FS.DETECTED)) {
onCreateProject(name);
} else if (FileKey.isGitRepository(new File(directory.getParentFile(),
directory.getName() + Constants.DOT_GIT_EXT), FS.DETECTED)) {
onCreateProject(name);
} else {
throw new RepositoryNotFoundException(gitDirOf(name));
}
}
} }
final FileKey loc = FileKey.lenient(gitDirOf(name), FS.DETECTED); final FileKey loc = FileKey.lenient(gitDirOf(name), FS.DETECTED);
try { try {