summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2016-06-29 08:21:27 +0200
committerJunio C Hamano <gitster@pobox.com>2016-06-29 09:51:00 -0700
commit33ba9c648b6753a4184e53ffb89f0a924f9f7b7e (patch)
tree5221e3c13db0154df779a89074b98034cb173bde /git-rebase--interactive.sh
parente46579643d56162299b1756b70d418005351b256 (diff)
downloadgit-33ba9c648b6753a4184e53ffb89f0a924f9f7b7e.tar.gz
rebase -i: restore autostash on abortps/rebase-i-auto-unstash-upon-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 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index b938a6d4aa..8fe7a7015b 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -216,6 +216,7 @@ exit_with_patch () {
}
die_abort () {
+ apply_autostash
rm -rf "$state_dir"
die "$1"
}