t3407: use test_cmp_rev
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>
Phillip Wood committed
Sep 13, 2021 at 15:19 UTC
7390c65df4fa997563ee2d1f61acd6ebb9697eac
1 file changed
+7
-7
t/t3407-rebase-abort.sh
+7
-7
@@ -29,7 +29,7 @@ testrebase() {
29
test_must_fail git rebase$type main &&
30
test_path_is_dir "$dotest" &&
31
git rebase --abort &&
32
- test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
32
+ test_cmp_rev to-rebase pre-rebase &&
33
test ! -d "$dotest"
34
'
35
@@ -39,9 +39,9 @@ testrebase() {
39
test_must_fail git rebase$type main &&
40
test_path_is_dir "$dotest" &&
41
test_must_fail git rebase --skip &&
42
- test $(git rev-parse HEAD) = $(git rev-parse main) &&
42
+ test_cmp_rev HEAD main &&
43
git rebase --abort &&
44
- test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
44
+ test_cmp_rev to-rebase pre-rebase &&
45
test ! -d "$dotest"
46
'
47
@@ -54,9 +54,9 @@ testrebase() {
54
echo d >> a &&
55
git add a &&
56
test_must_fail git rebase --continue &&
57
- test $(git rev-parse HEAD) != $(git rev-parse main) &&
57
+ test_cmp_rev ! HEAD main &&
58
git rebase --abort &&
59
- test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
59
+ test_cmp_rev to-rebase pre-rebase &&
60
test ! -d "$dotest"
61
'
62
@@ -91,7 +91,7 @@ test_expect_success 'rebase --apply --quit' '
91
test_path_is_dir .git/rebase-apply &&
92
head_before=$(git rev-parse HEAD) &&
93
git rebase --quit &&
94
- test $(git rev-parse HEAD) = $head_before &&
94
+ test_cmp_rev HEAD $head_before &&
95
test ! -d .git/rebase-apply
96
'
97
@@ -102,7 +102,7 @@ test_expect_success 'rebase --merge --quit' '
102
test_path_is_dir .git/rebase-merge &&
103
head_before=$(git rev-parse HEAD) &&
104
git rebase --quit &&
105
- test $(git rev-parse HEAD) = $head_before &&
105
+ test_cmp_rev HEAD $head_before &&
106
test ! -d .git/rebase-merge
107
'
108