mirrors/hermes-agent
1
0
Fork 0
mirror of https://github.com/NousResearch/hermes-agent.git synced 2026-04-28 01:21:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix: use git pull --ff-only in update/install to avoid divergent branch error

Browse source 
Fresh installs without pull.rebase configured hit a git error when
running hermes update because git doesn't know how to reconcile
divergent branches. --ff-only is the right strategy: it works for the
normal case (local branch is behind remote) and fails cleanly if the
user somehow has local commits, rather than silently rebasing them.
This commit is contained in:
Test 2026-03-20 22:25:17 -07:00
parent d560f2d1f2
commit 870ebb8850
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/install.sh
View file

@ -577,7 +577,7 @@ clone_repo() {
git fetch origin
git checkout "$BRANCH"
git pull origin "$BRANCH"
git pull --ff-only origin "$BRANCH"
if [ -n "$autostash_ref" ]; then
local restore_now="yes"