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.

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

CHE-4015 Add deleted files to index(Regression) #4187

Merged
merged 3 commits into from
Feb 27, 2017
Merged

CHE-4015 Add deleted files to index(Regression) #4187

merged 3 commits into from
Feb 27, 2017

Conversation

mmorhun
Copy link
Contributor

@mmorhun mmorhun commented Feb 20, 2017

What does this PR do?

Adds ability to add tracked deleted project-file to index.

What issues does this PR fix or reference?

#4015

Changelog

Fixed bug inGit->Add To Index menu command that was not adding deleted files to index.

Release Notes

Fixed bug inGit->Add To Index menu command that was not adding deleted files to index. This was an uncaught regression when Eclipse Che started using jGit.

Docs PR

N/A

@mmorhun mmorhun requested review from tolusha and vinokurig February 20, 2017 15:08
@@ -13,10 +13,6 @@
import com.google.inject.Inject;
import com.google.inject.Singleton;
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add yourself to authors.

@@ -275,6 +275,20 @@ public void add(AddParams params) throws GitException {

Copy link
Contributor

Choose a reason for hiding this comment

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

Please add yourself to authors.

@codenvy-ci
Copy link

@codenvy-ci
Copy link

@@ -275,6 +276,20 @@ public void add(AddParams params) throws GitException {

try {
addCommand.call();

// to add deleted files in index it is required to perform git rm on them
Copy link
Contributor

Choose a reason for hiding this comment

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

If you need a comment it means that code excerpt barely can be understood. Introduce a new method.

@codenvy-ci
Copy link

Build # 2019 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/2019/ to view the results.

@codenvy-ci
Copy link

} catch (GitAPIException exception) {
throw new GitException(exception.getMessage(), exception);
}
}

// to add deleted files in index it is required to perform git rm on them
Copy link
Contributor

Choose a reason for hiding this comment

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

Use javadoc.

Signed-off-by: Mykola Morhun <[email protected]>
@mmorhun mmorhun requested a review from bmicklea February 21, 2017 15:32
@codenvy-ci
Copy link

Build # 2024 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/2024/ to view the results.

@bmicklea bmicklea requested review from JamesDrummond and removed request for bmicklea February 21, 2017 16:04
@JamesDrummond
Copy link
Contributor

JamesDrummond commented Feb 21, 2017

Think we need this in release notes. I have been using a work around by clicking the update checkbox. Didn't know it was work around. Added release notes above.

@JamesDrummond JamesDrummond added the kind/bug Outline of a bug - must adhere to the bug report template. label Feb 21, 2017
@JamesDrummond
Copy link
Contributor

This is not a regression right as there was never a way to do this before?

@mmorhun
Copy link
Contributor Author

mmorhun commented Feb 22, 2017

I think it is kind of regression, because before switching to jGit it worked as expected.

@JamesDrummond JamesDrummond changed the title CHE-4015 Add deleted files to index CHE-4015 Add deleted files to index(Regression) Feb 22, 2017
@JamesDrummond
Copy link
Contributor

@mmorhun Thanks. I updated title and description above.

@vkuznyetsov vkuznyetsov added this to the 5.4.0 milestone Feb 23, 2017
@mmorhun mmorhun merged commit 7187062 into master Feb 27, 2017
@mmorhun mmorhun deleted the CHE-4015 branch February 27, 2017 15:55
@JamesDrummond JamesDrummond mentioned this pull request Mar 8, 2017
9 tasks
JPinkney pushed a commit to JPinkney/che that referenced this pull request Aug 17, 2017
CHE-4015: Fix deleted file is not added to index
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug Outline of a bug - must adhere to the bug report template.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants