• P
    rebase -i: restore autostash on abort · 33ba9c64
    Patrick Steinhardt 提交于
    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: NDaniel Hahler <git@thequod.de>
    Signed-off-by: NPatrick Steinhardt <ps@pks.im>
    Signed-off-by: NJunio C Hamano <gitster@pobox.com>
    33ba9c64
t3420-rebase-autostash.sh 6.4 KB