diff options
| -rw-r--r-- | git-rebase--interactive.sh | 4 | ||||
| -rwxr-xr-x | git-rebase.sh | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index f953d8d224..85f0e93eee 100644 --- 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 diff --git a/git-rebase.sh b/git-rebase.sh index a28209daba..9eb276ba20 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -147,7 +147,7 @@ move_to_original_branch () { esac } -finish_rebase () { +apply_autostash () { if test -f "$state_dir/autostash" then stash_sha1=$(cat "$state_dir/autostash") @@ -166,6 +166,10 @@ You can run "git stash pop" or "git stash drop" at any time. ' fi fi +} + +finish_rebase () { + apply_autostash && git gc --auto && rm -rf "$state_dir" } @@ -181,6 +185,11 @@ run_specific_rebase () { if test $ret -eq 0 then finish_rebase + elif test $ret -eq 2 # special exit status for rebase -i + then + apply_autostash && + rm -rf "$state_dir" && + die "Nothing to do" fi exit $ret } |