Merge branch 'rr/rebase-autostash-fix' into maint

The autostash mode of "git rebase -i" did not restore the dirty
working tree state if the user aborted the interactive rebase by
emptying the insn sheet.

* rr/rebase-autostash-fix:
rebase -i: test "Nothing to do" case with autostash
rebase -i: handle "Nothing to do" case with autostash

diff --cc git-rebase--interactive.sh
index 6ec9d3cb40b1e96f75132a11eb625fd42e64885d,85f0e93eee1400ba19d36caa75904435297a3f04..f267d8b6c3eea5c557e63814e40a9ef38b776354
--- 1/git-rebase--interactive.sh
--- 2/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -1056,13 -977,10 +1056,13 @@@ git_sequence_editor "$todo" |
        die_abort "Could not execute editor"
  
  has_action "$todo" ||
-       die_abort "Nothing to do"
+       return 2
  
 +expand_todo_ids
 +
  test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks
  
 +GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name"
  output git checkout $onto || die_abort "could not detach HEAD"
  git update-ref ORIG_HEAD $orig_head
  do_rest

diff --cc git-rebase.sh
Simple merge