mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
rebase -i: use the rebase--helper builtin
Now that the sequencer learned to process a "normal" interactive rebase, we use it. The original shell script is still used for "non-normal" interactive rebases, i.e. when --root or --preserve-merges was passed. Please note that the --root option (via the $squash_onto variable) needs special handling only for the very first command, hence it is still okay to use the helper upon continue/skip. Also please note that the --no-ff setting is volatile, i.e. when the interactive rebase is interrupted at any stage, there is no record of it. Therefore, we have to pass it from the shell script to the rebase--helper. Note: the test t3404 had to be adjusted because the the error messages produced by the sequencer comply with our current convention to start with a lower-case letter. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
4557f1add2
commit
18633e1a22
|
@ -1069,6 +1069,10 @@ git_rebase__interactive () {
|
|||
|
||||
case "$action" in
|
||||
continue)
|
||||
if test ! -d "$rewritten"
|
||||
then
|
||||
exec git rebase--helper ${force_rebase:+--no-ff} --continue
|
||||
fi
|
||||
# do we have anything to commit?
|
||||
if git diff-index --cached --quiet HEAD --
|
||||
then
|
||||
|
@ -1128,6 +1132,10 @@ first and then run 'git rebase --continue' again.")"
|
|||
skip)
|
||||
git rerere clear
|
||||
|
||||
if test ! -d "$rewritten"
|
||||
then
|
||||
exec git rebase--helper ${force_rebase:+--no-ff} --continue
|
||||
fi
|
||||
do_rest
|
||||
return 0
|
||||
;;
|
||||
|
@ -1314,6 +1322,11 @@ expand_todo_ids
|
|||
test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks
|
||||
|
||||
checkout_onto
|
||||
if test -z "$rebase_root" && test ! -d "$rewritten"
|
||||
then
|
||||
require_clean_work_tree "rebase"
|
||||
exec git rebase--helper ${force_rebase:+--no-ff} --continue
|
||||
fi
|
||||
do_rest
|
||||
|
||||
}
|
||||
|
|
|
@ -556,7 +556,7 @@ test_expect_success 'clean error after failed "exec"' '
|
|||
echo "edited again" > file7 &&
|
||||
git add file7 &&
|
||||
test_must_fail git rebase --continue 2>error &&
|
||||
test_i18ngrep "You have staged changes in your working tree." error
|
||||
test_i18ngrep "you have staged changes in your working tree" error
|
||||
'
|
||||
|
||||
test_expect_success 'rebase a detached HEAD' '
|
||||
|
|
Loading…
Reference in a new issue