[PATCH 09/10] t3404 (rebase -i): introduce helper to check position of HEAD
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Oct 31, 2010, 07:40 UTC
- Message-ID
- <20101031074030.GJ11483@burratino>
- In-Reply-To
- <20101031072640.GA11483@burratino>
The same code to check the position of HEAD is used by several tests in this script. Factor it out as a function and simplify it.
Noticed using an &&-chaining tester, because the current code does not propagate the precise exit status from errors.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- t/t3404-rebase-interactive.sh | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 4097a2d..4fcedda 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -29,6 +29,12 @@ Initial setup: . "$TEST_DIRECTORY"/lib-rebase.sh +test_cmp_rev () { + git describe --always --tags "$1" >expect.rev && + git describe --always --tags "$2" >actual.rev && + test_cmp expect.rev actual.rev +} + set_fake_editor # WARNING: Modifications to the initial repository can change the SHA ID used @@ -80,20 +86,12 @@ test_expect_success 'rebase -i with the exec command' ' test_path_is_file touch-one && test_path_is_file touch-two && test_path_is_missing touch-three " (should have stopped before)" && - test $(git rev-parse C) = $(git rev-parse HEAD) || { - echo "Stopped at wrong revision:" - echo "($(git describe --tags HEAD) instead of C)" - false - } && + test_cmp_rev C HEAD && git rebase --continue && test_path_is_file touch-three && test_path_is_file "touch-file name with spaces" && test_path_is_file touch-after-semicolon && - test $(git rev-parse master) = $(git rev-parse HEAD) || { - echo "Stopped at wrong revision:" - echo "($(git describe --tags HEAD) instead of master)" - false - } && + test_cmp_rev master HEAD && rm -f touch-* ' @@ -114,11 +112,7 @@ test_expect_success 'rebase -i with the exec command checks tree cleanness' ' export FAKE_LINES && test_must_fail git rebase -i HEAD^ ) && - test $(git rev-parse master^) = $(git rev-parse HEAD) || { - echo "Stopped at wrong revision:" - echo "($(git describe --tags HEAD) instead of master^)" - false - } && + test_cmp_rev master^ HEAD && git reset --hard && git rebase --continue '
-- 1.7.2.3.557.gab647.dirty