Skip to content
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

Fix #328 checkout to wrong folder using submodules #331

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

Fix #328 checkout to wrong folder using submodules #331

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
5 changes: 5 additions & 0 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 @@ -113,6 +113,11 @@ public Iterable<GitRepository> getRepositories(Project project) {

public Optional<GitRepository> getRepositoryForGerritProject(Project project, String gerritProjectName) {
final Iterable<GitRepository> repositoriesFromRoots = getRepositories(project);
for (GitRepository repository : repositoriesFromRoots) {
if (repository.getRoot().equals(project.getBaseDir())) {
return Optional.of(repository);
Copy link
Owner

Choose a reason for hiding this comment

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

Can you try to explain in which case this return will be triggered? I'm still not sure if this could break backwards compatibility with existing setups of this plugins.

Copy link
Author

Choose a reason for hiding this comment

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

It prefers the case, where the .git folder exists in the project root, where the source code is checked out, but submodules on a other place higher in the direcory tree.
This code would break backwards compatibility only, if a submodule is checked out into project root. But that is a very exotic setup in my opinion.

Copy link
Owner

Choose a reason for hiding this comment

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

Do you think we can combine this new logic with also remoteUrl == gerritProjectName (as used below)? I think that would a bit more safe.

Copy link
Author

Choose a reason for hiding this comment

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

I wouldn't do that, because as describted in #328, the URL's are exact the same (but different git branches).
That's the reason why it fails. Even in my case, I don't name the project as in gerrit because the projects sometimes contains slashes.

Copy link
Owner

Choose a reason for hiding this comment

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

I've just looked a bit into the code and had one more idea: we could also pass the branch name to getRepositoryForGerritProject and take it into account when comparing (check if remote branch name is equal). Do you think this would also help?

Another question: does you change also work when you want to check out a change which belongs to a sub project?

Thanks for you help!

}
}
for (GitRepository repository : repositoriesFromRoots) {
for (GitRemote remote : repository.getRemotes()) {
if (remote.getName().equals(gerritProjectName)) {
Expand Down