From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 29 Jun 2016 14:02:11 GMT
Subject: Re: [PATCH v2] rebase -i: restore autostash on abort
Message-ID: <alpine.DEB.2.20.1606291600300.12947@virtualbox>
In-Reply-To: <20160629062127.8946-1-ps@pks.im>

Hi Patrick,

On Wed, 29 Jun 2016, Patrick Steinhardt wrote:

> When we abort an interactive rebase we do so by calling
> `die_abort`, which cleans up after us by removing the rebase
> state directory. If the user has requested to use the autostash
> feature, though, the state directory may also contain a reference
> to the autostash, which will now be deleted.
> 
> Fix the issue by trying to re-apply the autostash in `die_abort`.
> This will also handle the case where the autostash does not apply
> cleanly anymore by recording it in a user-visible stash.

I like it. Thanks for including the tests, they were very helpful to
verify that my rebase--helper work is unaffected: the patch touches only
those parts that are not moved into the rebase--helper.

Thanks,
Johannes