fix(installer): recover bootstrap when managed git clone diverged - #55663
Merged
jquesnelle merged 2 commits intoJun 30, 2026
Conversation
Bootstrap and desktop updates run install.ps1/install.sh, which aborted with exit 128 when the managed checkout had diverged from origin/main. Mirror the hermes update recovery path: reset to origin/$BRANCH instead of failing the repository stage.
…ipts Pin the ff-only-then-reset fallback in install.sh and install.ps1 so bootstrap cannot regress to hard-failing on diverged git history.
alt-glitch
added
type/bug
Collaborator
jquesnelle
self-requested a review
June 30, 2026 16:37
jquesnelle
approved these changes
Jun 30, 2026
waefrebeorn
pushed a commit
to waefrebeorn/slermes
that referenced
this pull request
Jul 2, 2026
…ged-git-pull fix(installer): recover bootstrap when managed git clone diverged
habarmc1223-sudo
pushed a commit
to habarmc1223-sudo/hermes-agent-fluxmem
that referenced
this pull request
Jul 8, 2026
…ged-git-pull fix(installer): recover bootstrap when managed git clone diverged
santhreal
pushed a commit
to santhreal/hermes-agent
that referenced
this pull request
Jul 13, 2026
…ged-git-pull fix(installer): recover bootstrap when managed git clone diverged
Gravezzz
pushed a commit
to Gravezzz/hermes-agent
that referenced
this pull request
Jul 21, 2026
…ged-git-pull fix(installer): recover bootstrap when managed git clone diverged
leewenjie
pushed a commit
to leewenjie/hermes-agent
that referenced
this pull request
Aug 7, 2026
…ged-git-pull fix(installer): recover bootstrap when managed git clone diverged
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
3 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.
Summary
repositorystage when~/.hermes/hermes-agenthad diverged fromorigin/main(git pull --ff-onlyexit 128)hermes updatealready recovers by resetting toorigin/$BRANCH;install.shandinstall.ps1did notreset --hard origin/$BRANCHfallback to both installer scriptsFixes #53257. Supersedes #53363 by also covering
install.ps1(Windows bootstrap).Test plan
scripts/run_tests.sh tests/test_install_diverged_update.py -qbash -n scripts/install.sh