undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t3407: strengthen rebase --abort tests

Browse Source 
The existing tests only check that HEAD points to the correct
commit after aborting, they do not check that the original branch
is checked out.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2021-09-13 15:19:17 +00:00 committed by Junio C Hamano
parent 0b7ae738a6
commit 1e14bc11ed
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
t/t3407-rebase-abort.sh
View File

@ -19,6 +19,13 @@ test_expect_success setup '
test_commit "merge should fail on this, too" a e pre-rebase
'
# Check that HEAD is equal to "pre-rebase" and the current branch is
# "to-rebase"
check_head() {
test_cmp_rev HEAD pre-rebase &&
test "$(git symbolic-ref HEAD)" = refs/heads/to-rebase
}
testrebase() {
type=$1
state_dir=$2
@ -29,7 +36,7 @@ testrebase() {
test_must_fail git rebase$type main &&
test_path_is_dir "$state_dir" &&
git rebase --abort &&
test_cmp_rev to-rebase pre-rebase &&
check_head &&
test_path_is_missing "$state_dir"
'
@ -41,7 +48,7 @@ testrebase() {
test_must_fail git rebase --skip &&
test_cmp_rev HEAD main &&
git rebase --abort &&
test_cmp_rev to-rebase pre-rebase &&
check_head &&
test_path_is_missing "$state_dir"
'
@ -56,7 +63,7 @@ testrebase() {
test_must_fail git rebase --continue &&
test_cmp_rev ! HEAD main &&
git rebase --abort &&
test_cmp_rev to-rebase pre-rebase &&
check_head &&
test_path_is_missing "$state_dir"
'