Fix git config test failure #2836
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Change git config property used in tests to a test property instead of an existing one (difftool.prompt). Signed-off-by: Angel Misevski <[email protected]>
|
Can one of the admins verify this patch? |
TylerJewell
added
the
kind/task
|
lgtm - @vkuznyetsov? |
|
ci-build |
|
Build # 746 - FAILED Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/746/ to view the results. |
vinokurig
approved these changes
Oct 20, 2016
JPinkney
pushed a commit
to JPinkney/che
that referenced
this pull request
Aug 17, 2017
Change git config property used in tests to a test property instead of an existing one (difftool.prompt). Signed-off-by: Angel Misevski <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Changes property used for testing git config implementation to an unused one instead of
difftool.prompt.What issues does this PR fix or reference?
Fixes issue with running tests in
che-core-git-impl-jgitwhendifftool.promptoption is set globally.Previous behavior
JGit pulls the global config file when creating a repository. While running tests, if
difftool.promptis set in the global.gitconfigfile, this will causes tests to fail while buildingChe Core :: Git Impl JGit.New behavior
Changes
ConfigTest.javato use nonsense propertytest.prop, so that there is no conflict.Signed-off-by: Angel Misevski [email protected]