Fix #328 checkout to wrong folder using submodules #331
Conversation
| @@ -113,6 +113,11 @@ | |||
|
|
|||
| 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); | |||
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Do you think we can combine this new logic with also remoteUrl == gerritProjectName (as used below)? I think that would a bit more safe.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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!
|
Thank you |
See discussion in #330.