mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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:
commit
4a43d4f98a
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -167,4 +167,19 @@ testrebase "" .git/rebase-apply
|
|||
testrebase " --merge" .git/rebase-merge
|
||||
testrebase " --interactive" .git/rebase-merge
|
||||
|
||||
test_expect_success 'abort rebase -i with --autostash' '
|
||||
test_when_finished "git reset --hard" &&
|
||||
echo uncommited-content >file0 &&
|
||||
(
|
||||
write_script abort-editor.sh <<-\EOF &&
|
||||
echo >"$1"
|
||||
EOF
|
||||
test_set_editor "$(pwd)/abort-editor.sh" &&
|
||||
test_must_fail git rebase -i --autostash HEAD^ &&
|
||||
rm -f abort-editor.sh
|
||||
) &&
|
||||
echo uncommited-content >expected &&
|
||||
test_cmp expected file0
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue