mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-25 00:51:20 +00:00
Merge 21bafabb73 into 05d8f11085
This commit is contained in:
commit
e057849e58
1 changed files with 5 additions and 1 deletions
|
|
@ -752,7 +752,11 @@ clone_repo() {
|
||||||
if [ "$restore_now" = "yes" ]; then
|
if [ "$restore_now" = "yes" ]; then
|
||||||
log_info "Restoring local changes..."
|
log_info "Restoring local changes..."
|
||||||
if git stash apply "$autostash_ref"; then
|
if git stash apply "$autostash_ref"; then
|
||||||
git stash drop "$autostash_ref" >/dev/null
|
local autostash_drop_ref
|
||||||
|
autostash_drop_ref="$(git stash list --format='%gd %H' | awk -v sha="$autostash_ref" '$2 == sha {print $1; exit}')"
|
||||||
|
if [ -n "$autostash_drop_ref" ]; then
|
||||||
|
git stash drop "$autostash_drop_ref" >/dev/null
|
||||||
|
fi
|
||||||
log_warn "Local changes were restored on top of the updated codebase."
|
log_warn "Local changes were restored on top of the updated codebase."
|
||||||
log_warn "Review git diff / git status if Hermes behaves unexpectedly."
|
log_warn "Review git diff / git status if Hermes behaves unexpectedly."
|
||||||
else
|
else
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue