summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-16 10:06:57 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-16 10:06:57 -0700
commit4a43d4f98a1a6a472ce1e87c64cb6df0d1653d02 (patch)
tree298f55985603d82fbf0b56512e3a434dc08242a6 /git-rebase--interactive.sh
parent9d1d882e9c1d4a34e2ae3af47d50c1f115a6cf84 (diff)
parentddb5432d2390e1957e473618009ba3d2fbbf29a7 (diff)
downloadgit-4a43d4f98a1a6a472ce1e87c64cb6df0d1653d02.tar.gz
Merge branch 'rr/rebase-autostash-fix'
* rr/rebase-autostash-fix: rebase -i: test "Nothing to do" case with autostash rebase -i: handle "Nothing to do" case with autostash
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 6ec9d3cb40..f267d8b6c3 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -1049,14 +1049,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
expand_todo_ids