git-rebase-interactive: do not squash commits on abort
authorDmitry Potapov <dpotapov@gmail.com>
Mon, 8 Sep 2008 20:42:48 +0000 (00:42 +0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2008 15:37:48 +0000 (08:37 -0700)
commit8beb1f33d15af6cdb6bf7d8296fd73eb8df2f152
treef97993669b5335e4aac9dceaab2a018359e64e97
parentaaefbfa66c348a461b3081873ef42819c8b38dac
git-rebase-interactive: do not squash commits on abort

If git rebase interactive is stopped by "edit" command and then the user
said "git rebase --continue" while having some stage changes, git rebase
interactive is trying to amend the last commit by doing:
  git --soft reset && git commit

However, the user can abort commit for some reason by providing an empty
log message, and that would leave the last commit undone, while the user
being completely unaware about what happened. Now if the user tries to
continue, by issuing "git rebase --continue" that squashes two previous
commits.

Signed-off-by: Dmitry Potapov <dpotapov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh