diff options
author | Patrick Steinhardt <ps@pks.im> | 2016-06-29 08:21:27 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-06-29 09:51:00 -0700 |
commit | 33ba9c648b6753a4184e53ffb89f0a924f9f7b7e (patch) | |
tree | 5221e3c13db0154df779a89074b98034cb173bde /diffcore-order.c | |
parent | Git 2.6.6 (diff) | |
download | tgif-33ba9c648b6753a4184e53ffb89f0a924f9f7b7e.tar.xz |
rebase -i: restore autostash on abort
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.
Reported-by: Daniel Hahler <git@thequod.de>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-order.c')
0 files changed, 0 insertions, 0 deletions