You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
I tested this locally on Windows using the review branch.
Test steps:
Reset the settings repository with git reset --hard HEAD~1
Verified via git status that the settings repository was behind origin/main
-
Ran ide update
Verified via git status that the settings repository was fast-forwarded and is now up to date with origin/main
-
The update behavior works as expected for me.
One note: In my local setup, ide status still reported "Your settings are up-to-date" even before running ide update, although git status showed that the settings repository was behind. Therefore I verified the actual fix via git status before and after `ide update
I also checked the code changes briefly and they look reasonable to me.
One note: In my local setup, ide status still reported "Your settings are up-to-date" even before running ide update, although git status showed that the settings repository was behind. Therefore I verified the actual fix via git status before and after `ide update
Great finding. I assume that you have found an unrelated issue:
Via git reset you somehow tweaked the git repo to have some change but the missing commit hash might still present in git.
In IDEasy we do these things:
We determine the current commit hash from git
After every ide update (and ide create) we save that has to a file called .commit.id.
In order to figure out if ide update is required or not, we compare the latest commit hash. In order to know it, we more or less do a git pull and then ask git for the latest commit hash for that branch. Then we compare it to the .commit.id. If they are equal, we are already up-to-date otherwise we display the message that an update is required.
You already had the latest .commit.id synced by ide update and via git reset you "faked" the state.
So for a 100% valid test, you would also had to tweak your .commit.id file.
I would conclude that your test was successful and the feature is working.
One note: In my local setup, ide status still reported "Your settings are up-to-date" even before running ide update, although git status showed that the settings repository was behind. Therefore I verified the actual fix via git status before and after `ide update
Great finding. I assume that you have found an unrelated issue: Via git reset you somehow tweaked the git repo to have some change but the missing commit hash might still present in git. In IDEasy we do these things:
We determine the current commit hash from git
After every ide update (and ide create) we save that has to a file called .commit.id.
In order to figure out if ide update is required or not, we compare the latest commit hash. In order to know it, we more or less do a git pull and then ask git for the latest commit hash for that branch. Then we compare it to the .commit.id. If they are equal, we are already up-to-date otherwise we display the message that an update is required.
You already had the latest .commit.id synced by ide update and via git reset you "faked" the state. So for a 100% valid test, you would also had to tweak your .commit.id file. I would conclude that your test was successful and the feature is working.
Thanks for the explanation, that explains why ide status still reported the settings as up-to-date in my local setup.
This file contains hidden or 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
bugfixPR that fixes a bug issuesettingside-settings repo and replated processes and featuresupdaterelated to updating software or the entire ide
2 participants
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.
This PR fixes #1955
Implemented changes:
isSettingsRepositorySymlinkOrJunction()toisSettingsCodeRepositoryinIdeContext*Testing instructions
Please add conscise, understandable instructions on how a reviewer can test/verify the functionality of your contribution here:
cd settings && git reset head~1)ide statuside updateide status- now the updates should be applied and via commit id it was detected that no more updates are available.Checklist for this PR
Make sure everything is checked before merging this PR. For further info please also see
our DoD.
mvn clean testlocally all tests pass and build is successful#«issue-id»: «brief summary»(e.g.#921: fixed setup.bat). If no issue ID exists, title only.In Progressand assigned to you or there is no issue (might happen for very small PRs)with
internal