This commit is contained in:
Barbapapade 2026-04-24 19:24:58 -05:00 committed by GitHub
commit e057849e58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -752,7 +752,11 @@ 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
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 "Review git diff / git status if Hermes behaves unexpectedly."
else