mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-28 01:21:43 +00:00
Merge 2a0aa1de92 into 05d8f11085
This commit is contained in:
commit
d131e0bdfe
2 changed files with 108 additions and 1 deletions
|
|
@ -752,7 +752,12 @@ clone_repo() {
|
|||
if [ "$restore_now" = "yes" ]; then
|
||||
log_info "Restoring local changes..."
|
||||
if git stash apply "$autostash_ref"; then
|
||||
git stash drop "$autostash_ref" >/dev/null
|
||||
# Apply succeeded; dropping the captured stash ref can still fail
|
||||
# after an interrupted prior install (stale hash / not a stash ref).
|
||||
# Never abort the installer here — user changes are already applied (#14735).
|
||||
if ! git stash drop "$autostash_ref" >/dev/null 2>&1; then
|
||||
log_warn "Could not drop installer autostash (already removed or not a stash reference). Continuing. (#14735)"
|
||||
fi
|
||||
log_warn "Local changes were restored on top of the updated codebase."
|
||||
log_warn "Review git diff / git status if Hermes behaves unexpectedly."
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue