diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:49:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:49:31 -0700 |
| commit | d9036cd28c9b115fe38e2f629292f2ddf60fb805 (patch) | |
| tree | 3bfea3d65784d1719a86e5d86814ff6a9d81dc9a /git-rebase--interactive.sh | |
| parent | 8675779454ed3007bd2a8f83d013e05a65c2d480 (diff) | |
| parent | ddb5432d2390e1957e473618009ba3d2fbbf29a7 (diff) | |
| download | git-d9036cd28c9b115fe38e2f629292f2ddf60fb805.tar.gz git-d9036cd28c9b115fe38e2f629292f2ddf60fb805.tar.xz | |
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
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 6ec9d3cb4..f267d8b6c 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 |