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

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index f953d8d22499b9e41d3c0ed86183655e39d807af..85f0e93eee1400ba19d36caa75904435297a3f04 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -970,14 +970,14 @@ fi
 
 
 has_action "$todo" ||
-       die_abort "Nothing to do"
+       return 2
 
 cp "$todo" "$todo".backup
 git_sequence_editor "$todo" ||
        die_abort "Could not execute editor"
 
 has_action "$todo" ||
-       die_abort "Nothing to do"
+       return 2
 
 test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks