rebase: fix "rebase --continue" breakage
The --skip case was handled properly when rebasing without --merge, but the --continue case was not. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6fd2f5e60d
commit
3f735b6654
@ -170,7 +170,11 @@ do
|
|||||||
finish_rb_merge
|
finish_rb_merge
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
git am --resolved --3way --resolvemsg="$RESOLVEMSG"
|
head_name=$(cat .dotest/head-name) &&
|
||||||
|
onto=$(cat .dotest/onto) &&
|
||||||
|
orig_head=$(cat .dotest/orig-head) &&
|
||||||
|
git am --resolved --3way --resolvemsg="$RESOLVEMSG" &&
|
||||||
|
move_to_original_branch
|
||||||
exit
|
exit
|
||||||
;;
|
;;
|
||||||
--skip)
|
--skip)
|
||||||
|
@ -39,6 +39,19 @@ test_expect_success 'rebase --skip with am -3' '
|
|||||||
git reset --hard HEAD &&
|
git reset --hard HEAD &&
|
||||||
git rebase --skip
|
git rebase --skip
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'rebase moves back to skip-reference' '
|
||||||
|
test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
|
||||||
|
git branch post-rebase &&
|
||||||
|
git reset --hard pre-rebase &&
|
||||||
|
! git rebase master &&
|
||||||
|
echo "hello" > hello &&
|
||||||
|
git add hello &&
|
||||||
|
git rebase --continue &&
|
||||||
|
test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
|
||||||
|
git reset --hard post-rebase
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
|
test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
|
||||||
|
|
||||||
test_expect_failure 'rebase with --merge' 'git rebase --merge master'
|
test_expect_failure 'rebase with --merge' 'git rebase --merge master'
|
||||||
@ -51,6 +64,10 @@ test_expect_success 'rebase --skip with --merge' '
|
|||||||
test_expect_success 'merge and reference trees equal' \
|
test_expect_success 'merge and reference trees equal' \
|
||||||
'test -z "`git diff-tree skip-merge skip-reference`"'
|
'test -z "`git diff-tree skip-merge skip-reference`"'
|
||||||
|
|
||||||
|
test_expect_success 'moved back to branch correctly' '
|
||||||
|
test refs/heads/skip-merge = $(git symbolic-ref HEAD)
|
||||||
|
'
|
||||||
|
|
||||||
test_debug 'gitk --all & sleep 1'
|
test_debug 'gitk --all & sleep 1'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
Loading…
Reference in New Issue
Block a user