From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Mon, 19 May 2014 22:05:20 +0000 (-0400)
Subject: rebase -i: handle "Nothing to do" case with autostash
X-Git-Tag: v2.0.1~5^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e4244eb3957d478ca05b42d8b56aadb9ab2bc7ae?hp=e4244eb3957d478ca05b42d8b56aadb9ab2bc7ae

rebase -i: handle "Nothing to do" case with autostash

When a user invokes

$ git rebase -i @~3

with dirty files and rebase.autostash turned on, and exits the $EDITOR
with an empty buffer, the autostash fails to apply. Although the primary
focus of rr/rebase-autostash was to get the git-rebase--backend.sh
scripts to return control to git-rebase.sh, it missed this case in
git-rebase--interactive.sh. Since this case is unlike the other cases
which return control for housekeeping, assign it a special return status
and handle that return value explicitly in git-rebase.sh.

Reported-by: Karen Etheridge <ether@cpan.org>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---