Skip to content

Fix #328 checkout to wrong folder using submodules #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jankorichter wants to merge 1 commit into
base: intellij14
Choose a base branch
from
Open

Fix #328 checkout to wrong folder using submodules #330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions src/main/java/com/urswolfer/intellij/plugin/gerrit/git/GerritGitUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,8 @@ public Iterable<GitRepository> getRepositories(Project project) {
public Optional<GitRepository> getRepositoryForGerritProject(Project project, String gerritProjectName) {
final Iterable<GitRepository> repositoriesFromRoots = getRepositories(project);
for (GitRepository repository : repositoriesFromRoots) {
for (GitRemote remote : repository.getRemotes()) {
if (remote.getName().equals(gerritProjectName)) {
return Optional.of(repository);
}
for (String remoteUrl : remote.getUrls()) {
remoteUrl = UrlUtils.stripGitExtension(remoteUrl);
if (remoteUrl != null && remoteUrl.endsWith(gerritProjectName)) {
return Optional.of(repository);
}
}
if (repository.getRoot().getCanonicalPath().equals(project.getBaseDir().getCanonicalPath())) {
Copy link
Copy Markdown
Owner

@uwolfer uwolfer Oct 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this solution looks a bit too simple to be true :)

Are you really sure that the code above is not required anymore?

return Optional.of(repository);
}
}
return Optional.absent();
Expand Down