mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t3407: use test_cmp_rev

Browse Source 
This provides better diagnostics if a test fails

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:14 +00:00
committed by Junio C Hamano
parent e505f452d4
commit 7390c65df4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ testrebase() {
test_must_fail git rebase$type main &&
test_path_is_dir "$dotest" &&
git rebase --abort &&
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
test_cmp_rev to-rebase pre-rebase &&
test ! -d "$dotest"
'
@ -39,9 +39,9 @@ testrebase() {
test_must_fail git rebase$type main &&
test_path_is_dir "$dotest" &&
test_must_fail git rebase --skip &&
test $(git rev-parse HEAD) = $(git rev-parse main) &&
test_cmp_rev HEAD main &&
git rebase --abort &&
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
test_cmp_rev to-rebase pre-rebase &&
test ! -d "$dotest"
'
@ -54,9 +54,9 @@ testrebase() {
echo d >> a &&
git add a &&
test_must_fail git rebase --continue &&
test $(git rev-parse HEAD) != $(git rev-parse main) &&
test_cmp_rev ! HEAD main &&
git rebase --abort &&
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
test_cmp_rev to-rebase pre-rebase &&
test ! -d "$dotest"
'
@ -91,7 +91,7 @@ test_expect_success 'rebase --apply --quit' '
test_path_is_dir .git/rebase-apply &&
head_before=$(git rev-parse HEAD) &&
git rebase --quit &&
test $(git rev-parse HEAD) = $head_before &&
test_cmp_rev HEAD $head_before &&
test ! -d .git/rebase-apply
'
@ -102,7 +102,7 @@ test_expect_success 'rebase --merge --quit' '
test_path_is_dir .git/rebase-merge &&
head_before=$(git rev-parse HEAD) &&
git rebase --quit &&
test $(git rev-parse HEAD) = $head_before &&
test_cmp_rev HEAD $head_before &&
test ! -d .git/rebase-merge
'