diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-10-31 02:40:30 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-09 15:06:41 -0800 |
| commit | 5c947e2c386aea5c94546c7a40a0d4d7f7b3934a (patch) | |
| tree | 33b89af06b44fb038db2ce8b1ecc32b942172093 /t/t3404-rebase-interactive.sh | |
| parent | 99b028e5589702320630c094d510d885ac8c9e50 (diff) | |
| download | git-5c947e2c386aea5c94546c7a40a0d4d7f7b3934a.tar.gz git-5c947e2c386aea5c94546c7a40a0d4d7f7b3934a.tar.xz | |
t3404 (rebase -i): introduce helper to check position of HEAD
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | 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 4097a2d9c..4fcedda23 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 ' |