mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 10:36:15 +02:00
Code

git rebase --abort: always restore the right commit 

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.

[jc: cherry-picked from 48411d and 4947cf9 on 'master']

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mike Hommey 2008-03-01 11:32:14 +01:00 committed by Junio C Hamano
parent 92aeb994d3
commit 4201bb5f7e
2 changed files with 73 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-rebase.sh
View File

@ -208,16 +208,15 @@ do
if test -d "$dotest"
then
move_to_original_branch
rm -r "$dotest"
elif test -d .dotest
then
dotest=.dotest
move_to_original_branch
rm -r .dotest
else
die "No rebase in progress?"
fi
git reset --hard ORIG_HEAD
git reset --hard $(cat $dotest/orig-head)
rm -r "$dotest"
exit
;;
--onto)

71
t/t3407-rebase-abort.sh Executable file
View File

@ -0,0 +1,71 @@
#!/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
'
testrebase() {
type=$1
dotest=$2
test_expect_success "rebase$type --abort" '
# Clean up the state from the previous one
git reset --hard pre-rebase
test_must_fail git rebase'"$type"' master &&
test -d '$dotest' &&
git rebase --abort &&
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
test ! -d '$dotest'
'
test_expect_success "rebase$type --abort after --skip" '
# Clean up the state from the previous one
git reset --hard pre-rebase
test_must_fail git rebase'"$type"' master &&
test -d '$dotest' &&
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 ! -d '$dotest'
'
test_expect_success "rebase$type --abort after --continue" '
# Clean up the state from the previous one
git reset --hard pre-rebase
test_must_fail git rebase'"$type"' master &&
test -d '$dotest' &&
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 ! -d '$dotest'
'
}
testrebase "" .dotest
testrebase " --merge" .git/.dotest-merge
test_done