Re: [PATCH] rebase -i: restore autostash on abort

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 28, 2016, 21:13 UTC
Message-ID: <xmqqshvx6mpe.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <vpqvb0tqc46.fsf@anie.imag.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

> It is "interesting" if you mean "matches real-life use-case", as it
> corresponds to the case where the user killed the editor (as reported by
> Daniel Hahler indeed, "Abort with ":cq", which will make Vim exit
> non-zero").

Yes. It is an interesting failure mode in that sense. But breakage of such a basic mode is something an end-user is likely to notice immediately, so in that sense, having such a test alone is not all that interesting.

Show 6 quoted lines

> If you mean "likely to trigger nasty bugs", then indeed testing the case
> when apply_autostash fails is interesting: for example, calling
> die_abort when "stash apply" fails is tempting, but would lead to
> infinite recursion (it doesn't seem to be the case, but a test would be
> nice). Setting the editor to something that modifies uncommited-content
> before 'false' should do the trick.