From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Phillip Wood" <phillip.wood123@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Phillip Wood" <phillip.wood@dunelm.org.uk>,
"Phillip Wood" <phillip.wood@dunelm.org.uk>
Subject: [PATCH v2 03/11] t3407: use test_cmp_rev
Date: Mon, 13 Sep 2021 15:19:14 +0000 [thread overview]
Message-ID: <7755ce17fef90729275334a735d31a348a0ddbc0.1631546362.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1033.v2.git.1631546362.gitgitgadget@gmail.com>
From: Phillip Wood <phillip.wood@dunelm.org.uk>
This provides better diagnostics if a test fails
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
t/t3407-rebase-abort.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh
index 0ad21966bc5..39076ac9462 100755
--- a/t/t3407-rebase-abort.sh
+++ b/t/t3407-rebase-abort.sh
@@ -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
'
--
gitgitgadget
next prev parent reply other threads:[~2021-09-13 15:45 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 9:49 [PATCH 00/11] rebase: dereference tags Phillip Wood via GitGitGadget
2021-09-08 9:49 ` [PATCH 01/11] t3407: run tests in $TEST_DIRECTORY Phillip Wood via GitGitGadget
2021-09-08 10:41 ` Ævar Arnfjörð Bjarmason
2021-09-08 9:49 ` [PATCH 02/11] t3407: use test_commit Phillip Wood via GitGitGadget
2021-09-08 10:39 ` Ævar Arnfjörð Bjarmason
2021-09-08 9:49 ` [PATCH 03/11] t3407: use test_cmp_rev Phillip Wood via GitGitGadget
2021-09-08 10:40 ` Ævar Arnfjörð Bjarmason
2021-09-08 13:42 ` Phillip Wood
2021-09-08 9:49 ` [PATCH 04/11] t3407: rename a variable Phillip Wood via GitGitGadget
2021-09-08 9:49 ` [PATCH 05/11] t3407: use test_path_is_missing Phillip Wood via GitGitGadget
2021-09-08 9:49 ` [PATCH 06/11] t3407: strengthen rebase --abort tests Phillip Wood via GitGitGadget
2021-09-08 10:42 ` Ævar Arnfjörð Bjarmason
2021-09-08 9:49 ` [PATCH 07/11] t3407: rework rebase --quit tests Phillip Wood via GitGitGadget
2021-09-08 9:49 ` [PATCH 08/11] rebase: remove redundant strbuf Phillip Wood via GitGitGadget
2021-09-09 10:35 ` Johannes Schindelin
2021-09-08 9:49 ` [PATCH 09/11] rebase: use our standard error return value Phillip Wood via GitGitGadget
2021-09-08 9:49 ` [PATCH 10/11] rebase: use lookup_commit_reference_by_name() Phillip Wood via GitGitGadget
2021-09-08 9:49 ` [PATCH 11/11] rebase: dereference tags Phillip Wood via GitGitGadget
2021-09-08 10:45 ` Ævar Arnfjörð Bjarmason
2021-09-13 15:19 ` [PATCH v2 00/11] " Phillip Wood via GitGitGadget
2021-09-13 15:19 ` [PATCH v2 01/11] t3407: run tests in $TEST_DIRECTORY Phillip Wood via GitGitGadget
2021-09-13 15:19 ` [PATCH v2 02/11] t3407: use test_commit Phillip Wood via GitGitGadget
2021-09-13 15:19 ` Phillip Wood via GitGitGadget [this message]
2021-09-13 15:19 ` [PATCH v2 04/11] t3407: rename a variable Phillip Wood via GitGitGadget
2021-09-13 15:19 ` [PATCH v2 05/11] t3407: use test_path_is_missing Phillip Wood via GitGitGadget
2021-09-13 15:19 ` [PATCH v2 06/11] t3407: strengthen rebase --abort tests Phillip Wood via GitGitGadget
2021-09-13 15:19 ` [PATCH v2 07/11] t3407: rework rebase --quit tests Phillip Wood via GitGitGadget
2021-09-13 15:19 ` [PATCH v2 08/11] rebase: remove redundant strbuf Phillip Wood via GitGitGadget
2021-09-13 18:34 ` René Scharfe
2021-09-13 22:40 ` Junio C Hamano
2021-09-14 10:31 ` Phillip Wood
2021-09-14 10:33 ` Phillip Wood
2021-09-13 15:19 ` [PATCH v2 09/11] rebase: use our standard error return value Phillip Wood via GitGitGadget
2021-09-13 15:19 ` [PATCH v2 10/11] rebase: use lookup_commit_reference_by_name() Phillip Wood via GitGitGadget
2021-09-13 15:19 ` [PATCH v2 11/11] rebase: dereference tags Phillip Wood via GitGitGadget
2021-09-13 22:58 ` Junio C Hamano
2021-09-14 10:17 ` Phillip Wood
2021-09-14 13:27 ` Phillip Wood
2021-09-14 16:29 ` Junio C Hamano
2021-09-14 3:42 ` Elijah Newren
2021-09-14 9:48 ` Sergey Organov
2021-09-14 9:58 ` Phillip Wood
2021-09-14 4:02 ` [PATCH v2 00/11] " Elijah Newren
2021-09-21 10:23 ` [PATCH v3 00/10] " Phillip Wood via GitGitGadget
2021-09-21 10:23 ` [PATCH v3 01/10] t3407: run tests in $TEST_DIRECTORY Phillip Wood via GitGitGadget
2021-09-21 10:23 ` [PATCH v3 02/10] t3407: use test_commit Phillip Wood via GitGitGadget
2021-09-21 10:24 ` [PATCH v3 03/10] t3407: use test_cmp_rev Phillip Wood via GitGitGadget
2021-09-21 10:24 ` [PATCH v3 04/10] t3407: rename a variable Phillip Wood via GitGitGadget
2021-09-21 10:24 ` [PATCH v3 05/10] t3407: use test_path_is_missing Phillip Wood via GitGitGadget
2021-09-21 10:24 ` [PATCH v3 06/10] t3407: strengthen rebase --abort tests Phillip Wood via GitGitGadget
2021-09-21 10:24 ` [PATCH v3 07/10] t3407: rework rebase --quit tests Phillip Wood via GitGitGadget
2021-09-21 10:24 ` [PATCH v3 08/10] rebase: use our standard error return value Phillip Wood via GitGitGadget
2021-09-21 10:24 ` [PATCH v3 09/10] rebase: use lookup_commit_reference_by_name() Phillip Wood via GitGitGadget
2021-09-21 10:24 ` [PATCH v3 10/10] rebase: dereference tags Phillip Wood via GitGitGadget
2021-09-24 1:26 ` [PATCH v3 00/10] " Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7755ce17fef90729275334a735d31a348a0ddbc0.1631546362.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.