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

Jump to bottom

CHE-3221: Fix git compare on submodules. #5799

Merged
merged 2 commits into from
Jul 25, 2017
Merged

CHE-3221: Fix git compare on submodules. #5799

merged 2 commits into from
Jul 25, 2017

Conversation

mmorhun
Copy link
Contributor

@mmorhun mmorhun commented Jul 25, 2017 •
edited by bmicklea
Loading

What does this PR do?

Fixes bug which makes git compare with latest version failed if project submodule is active.

What issues does this PR fix or reference?

#3221

Changelog

Fix git compare when using it with the latest version and a project with submodules.

Release Notes

N/A

Docs PR

N/A

@mmorhun
CHE-3221: Fix git compare on submodules.
89efc1a 
Signed-off-by: Mykola Morhun <mmorhun@redhat.com>
@mmorhun mmorhun requested a review from vparfonov as a code owner July 25, 2017 07:08
@vzhukovs
Copy link
Contributor

It would be better to move implementation of this method into this utility class org.eclipse.che.ide.ext.git.client.GitUtil. For now there is no need to add additional method into resource interface.

@codenvy-ci
Copy link

Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/3163/

@mmorhun
CHE-3221: Move getRootProjects to GitUtils
197f8d4 
Signed-off-by: Mykola Morhun <mmorhun@redhat.com>
@mmorhun
Copy link
Contributor Author

mmorhun commented Jul 25, 2017

To me it is not clear better or not to move getRootProject method into GitUtils. In one hand it is used now only in one place inside git plugin, but in the other hand this method theoretically could be needed by other stuff and to avoid code duplicates would be better to keep it in the Resource interface.
I am not against to place it in GitUtils, and if you think that moving to GitUtils will be better - let be so.

@codenvy-ci
Copy link

Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/3165/

bmicklea
bmicklea approved these changes Jul 25, 2017
View reviewed changes
Copy link

@bmicklea bmicklea left a comment

Choose a reason for hiding this comment

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

updated changelog entry.

@mmorhun mmorhun merged commit d5de61b into master Jul 25, 2017
@mmorhun mmorhun deleted the CHE-3221 branch July 25, 2017 14:46
mshaposhnik pushed a commit that referenced this pull request Jul 27, 2017
@mmorhun @mshaposhnik
CHE-3221: Fix git compare on submodules. (#5799)
f1f03cf 
* CHE-3221: Fix git compare on submodules.
dmytro-ndp pushed a commit to dmytro-ndp/che that referenced this pull request Aug 16, 2017
@mmorhun
CHE-3221: Fix git compare on submodules. (eclipse-che#5799)
78a8dd4 
* CHE-3221: Fix git compare on submodules.
JPinkney pushed a commit to JPinkney/che that referenced this pull request Aug 17, 2017
@mmorhun
CHE-3221: Fix git compare on submodules. (eclipse-che#5799)
1bb7d26 
* CHE-3221: Fix git compare on submodules.
@slemeur slemeur added this to the 5.17.0 milestone Sep 28, 2017
@slemeur slemeur added the kind/bug Outline of a bug - must adhere to the bug report template. label Sep 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vparfonov vparfonov vparfonov approved these changes

@vzhukovs vzhukovs vzhukovs approved these changes

@bmicklea bmicklea bmicklea approved these changes

@vinokurig vinokurig vinokurig approved these changes

Assignees
No one assigned
Labels
kind/bug Outline of a bug - must adhere to the bug report template.
Projects
None yet
Milestone
5.17.0
Development

Successfully merging this pull request may close these issues.
7 participants
@mmorhun @vzhukovs @codenvy-ci @vparfonov @bmicklea @vinokurig @slemeur