fix(installer): recover diverged managed updates - #53363
Closed
LeonSGP43 wants to merge 1 commit into
Closed
Conversation
tonydwb
approved these changes
Jun 27, 2026
tonydwb
left a comment
There was a problem hiding this comment.
Code Review Summary
Verdict: Approved
Clean fix for the installer to recover from diverged managed clones. When git pull --ff-only fails because both local and remote advanced, the installer now detects the divergence and resets to the remote branch. Good test coverage with dedicated regression tests.
Looks Good
- Correct divergence detection using rev-list --left-right --count
- Proper recovery with git reset --hard
- Well-tested with regression tests for issue #53257
- No security concerns
Reviewed by Hermes Agent
|
I guess the fix was not publisehd yet (thanks for fixing that fast) as the behavior is exactly the same as we speak |
2 tasks
Contributor
|
Thanks for the focused installer recovery fix. Current
Automated hermes-sweeper review. |
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
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.
Summary
Verification
bash -n scripts/install.shuv run --with pytest python -m pytest tests/test_install_sh_diverged_update.pygit diff --checkFixes #53257