Nothing open on GitHub. Fix merged in #126166 on 28 Sep 2026. Check it covers your case.
The short answer
- Known?
- Yes. 3 related items grouped here, 1 issue already closed.
- Fix event
- A fix was merged to main in PR #126166. Check it covers your case. No release data is tracked.
- Tracker
- The maintainers' tracker marks this
resolved, deciding PR #126166. That is separate from the fix event. - Still open
- Nothing open on GitHub.
These items address correctness of divergence detection and update behavior, including avoiding false divergence reports, skipping updates during rebase, handling edge cases like index locks and lazy-fetch failures, and writing rescue refs when fast-forward fails.
Open issues0
Open PRs0
Fixes on record
-
#126166 hermes update tells the truth about git state: no false divergence, no update under a rebase, no 'complete' with a parked patch, works from a PM venv
files:
hermes_cli/_early_recovery.py,hermes_cli/update_cmd.py,hermes_cli/update_cmd_stash.py,hermes_cli/update_owning_install.py,tests/e2e/core/upgrade/git/test_foreign_state.py,tests/e2e/core/upgrade/git/test_local_modifications.py,tests/e2e/core/upgrade/git/test_truthful_outcome.py,tests/e2e/core/upgrade/pm/test_stamps_and_doctor.py,tests/hermes_cli/test_update_autostash.py,tests/hermes_cli/test_update_diverged_rescue_ref.py,tests/hermes_cli/test_update_owning_install.py,tests/hermes_cli/test_update_parked_branch_guard.py
1 PR closed without merging
From the close comments: other 1
-
#124665 fix(update): prove divergence before reset fallback · other →
384ab57,#124642,#121174,#114925,#119509,#118148,#94680,#120339
Closed issues · 1
- Closed#124642hermes update reports "history diverged", writes a rescue ref and advises HEAD is now at ad4c40d8ecb catalog: pin antigravity-subscription-directsdk v1.0.4 when the fast-forward failed for another reason (index.lock, lazy-fetch failure)
How this cluster was grouped
-
Link evidence (
structural links throughout): every member is connected by structural evidence: shared changed files, or a closing/superseded reference. -
Pairwise link density
0.67: the share of item pairs that carry a link, counting a structural link in full and a relevance-only link at 0.36.1.00means every pair is linked.
Pick up a Lab task
Check whether a fix covers the open issues here, with your own agent. Bring back evidence for maintainers.
Open the LabAt a glance
- Merged PRs
- #126166
- Closed issues
- 1
- Attempts
- 1 PR closed without merging
- Fix link checked
- 28 Sep 2026