Re: [PATCH] rebase: apply and cleanup autostash when rebase fails to start

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 14, 2024, 17:27 UTC
Message-ID: <xmqq8qwzypz2.fsf@gitster.g>
In-Reply-To: <b676bd17-1cc8-4639-acb7-675dde32a1ae@gmail.com>

Phillip Wood <phillip.wood123@gmail.com> writes:

Show 6 quoted lines

> Applying the stash should not fail because the rebase has not started
> and so HEAD, the index and the worktree are unchanged since the stash
> was created. If it does fail for some reason then apply_autostash()
> creates a new entry under refs/stash. We definitely do want to remove
> the directory otherwise we're left with the inconsistent state we're
> tying to fix.

If it is not expected to fail 99% of times, it feels more prudent to abort loudly without making further damage to lose information and ask the user to check what happened in the working tree, rather than blindly removing the clue to understand what went wrong. For example, could the reason why applying the stash failed be because the user forgot that the working tree was being used for rebasing and mucked with its contents from say another terminal?

Thanks.