From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 18:49:31 +0000 (-0700)
Subject: Merge branch 'rr/rebase-autostash-fix' into maint
X-Git-Tag: v2.0.1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9036cd28c9b115fe38e2f629292f2ddf60fb805;p=thirdparty%2Fgit.git

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
---

d9036cd28c9b115fe38e2f629292f2ddf60fb805
diff --cc git-rebase--interactive.sh
index 6ec9d3cb40,85f0e93eee..f267d8b6c3
--- a/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