mirror of
https://github.com/git/git.git
synced 2024-11-05 08:47:56 +01:00
3f735b6654
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>
73 lines
1.7 KiB
Bash
Executable file
73 lines
1.7 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Eric Wong
|
|
#
|
|
|
|
test_description='git rebase --merge --skip tests'
|
|
|
|
. ./test-lib.sh
|
|
|
|
# we assume the default git-am -3 --skip strategy is tested independently
|
|
# and always works :)
|
|
|
|
test_expect_success setup '
|
|
echo hello > hello &&
|
|
git add hello &&
|
|
git commit -m "hello" &&
|
|
git branch skip-reference &&
|
|
|
|
echo world >> hello &&
|
|
git commit -a -m "hello world" &&
|
|
echo goodbye >> hello &&
|
|
git commit -a -m "goodbye" &&
|
|
|
|
git checkout -f skip-reference &&
|
|
echo moo > hello &&
|
|
git commit -a -m "we should skip this" &&
|
|
echo moo > cow &&
|
|
git add cow &&
|
|
git commit -m "this should not be skipped" &&
|
|
git branch pre-rebase skip-reference &&
|
|
git branch skip-merge skip-reference
|
|
'
|
|
|
|
test_expect_failure 'rebase with git am -3 (default)' '
|
|
git rebase master
|
|
'
|
|
|
|
test_expect_success 'rebase --skip with am -3' '
|
|
git reset --hard HEAD &&
|
|
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_failure 'rebase with --merge' 'git rebase --merge master'
|
|
|
|
test_expect_success 'rebase --skip with --merge' '
|
|
git reset --hard HEAD &&
|
|
git rebase --skip
|
|
'
|
|
|
|
test_expect_success 'merge and reference trees equal' \
|
|
'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_done
|