diff options
| author | Tay Ray Chuan <rctay89@gmail.com> | 2010-03-02 18:49:26 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 11:10:35 -0800 |
| commit | 6cbd6e92616773457574f9755910f44b3c34a983 (patch) | |
| tree | da71a91b7cac91543391a967c7536f671dc3806c /t/t5541-http-push.sh | |
| parent | fe4bc2a5aeb59b5767a3f8f4246ac088d4a13d73 (diff) | |
| download | git-6cbd6e92616773457574f9755910f44b3c34a983.tar.gz | |
t554[01]-http-push: refactor, add non-ff tests
Move non-fast forward tests to lib-httpd.sh so that we don't have to
duplicate the tests in both t5540 and t5541.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5541-http-push.sh')
| -rwxr-xr-x | t/t5541-http-push.sh | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index ff947f3e4b..795dc2bcdf 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -88,28 +88,8 @@ test_expect_success 'used receive-pack service' ' test_cmp exp act ' -test_expect_success 'non-fast-forward push fails' ' - cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git && - HEAD=$(git rev-parse --verify HEAD) && - - cd "$ROOT_PATH"/test_repo_clone && - git checkout master && - echo "changed" > path2 && - git commit -a -m path2 --amend && - - !(git push -v origin >output 2>&1) && - (cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git && - test $HEAD = $(git rev-parse --verify HEAD)) -' - -test_expect_success 'non-fast-forward push show ref status' ' - grep "^ ! \[rejected\][ ]*master -> master (non-fast-forward)$" output -' - -test_expect_success 'non-fast-forward push shows help message' ' - grep "To prevent you from losing history, non-fast-forward updates were rejected" \ - output -' +test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \ + "$ROOT_PATH"/test_repo_clone master test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' ' # create a dissimilarly-named remote ref so that git is unable to match the |