mirror of
https://github.com/git/git.git
synced 2024-11-14 21:23:03 +01:00
48411d2233
Previously, --abort would end by git resetting to ORIG_HEAD, but some commands, such as git reset --hard (which happened in git rebase --skip, but could just as well be typed by the user), would have already modified ORIG_HEAD. Just use the orig-head we store in $dotest instead. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
59 lines
1.4 KiB
Bash
Executable file
59 lines
1.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git rebase --abort tests'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
echo a > a &&
|
|
git add a &&
|
|
git commit -m a &&
|
|
git branch to-rebase &&
|
|
|
|
echo b > a &&
|
|
git commit -a -m b &&
|
|
echo c > a &&
|
|
git commit -a -m c &&
|
|
|
|
git checkout to-rebase &&
|
|
echo d > a &&
|
|
git commit -a -m "merge should fail on this" &&
|
|
echo e > a &&
|
|
git commit -a -m "merge should fail on this, too" &&
|
|
git branch pre-rebase
|
|
'
|
|
|
|
test_expect_success 'rebase --abort' '
|
|
test_must_fail git rebase master &&
|
|
git rebase --abort &&
|
|
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
|
|
'
|
|
|
|
test_expect_success 'rebase --abort after --skip' '
|
|
# Clean up the state from the previous one
|
|
git reset --hard pre-rebase
|
|
rm -rf .dotest
|
|
|
|
test_must_fail git rebase master &&
|
|
test_must_fail git rebase --skip &&
|
|
test $(git rev-parse HEAD) = $(git rev-parse master) &&
|
|
git rebase --abort &&
|
|
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
|
|
'
|
|
|
|
test_expect_success 'rebase --abort after --continue' '
|
|
# Clean up the state from the previous one
|
|
git reset --hard pre-rebase
|
|
rm -rf .dotest
|
|
|
|
test_must_fail git rebase master &&
|
|
echo c > a &&
|
|
echo d >> a &&
|
|
git add a &&
|
|
test_must_fail git rebase --continue &&
|
|
test $(git rev-parse HEAD) != $(git rev-parse master) &&
|
|
git rebase --abort &&
|
|
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
|
|
'
|
|
|
|
test_done
|