This commit is contained in:
Bartok 2026-04-24 19:25:30 -05:00 committed by GitHub
commit d131e0bdfe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 108 additions and 1 deletions

View file

@ -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