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
This commit is contained in:
Junio C Hamano
2014-06-16 10:06:57 -07:00
3 changed files with 27 additions and 3 deletions

View File

@ -155,7 +155,7 @@ move_to_original_branch () {
esac
}
finish_rebase () {
apply_autostash () {
if test -f "$state_dir/autostash"
then
stash_sha1=$(cat "$state_dir/autostash")
@ -171,6 +171,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"
}
@ -186,6 +190,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
}