diff options
| author | Jeff King <peff@peff.net> | 2014-05-30 01:34:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-30 16:46:19 (GMT) |
| commit | d7172825321369cb951dd7bbfc0c12dc4ecbe518 (patch) | |
| tree | 6b62e05ebe9a9c657c3c28afc7b180d3c45c107b /t | |
| parent | e156455ea49124c140a67623f22a393db62d5d98 (diff) | |
| download | git-d7172825321369cb951dd7bbfc0c12dc4ecbe518.zip git-d7172825321369cb951dd7bbfc0c12dc4ecbe518.tar.gz git-d7172825321369cb951dd7bbfc0c12dc4ecbe518.tar.bz2 | |
t5537: re-drop http tests
These were originally removed by 0232852 (t5537: move
http tests out to t5539, 2014-02-13). However, they were
accidentally re-added in 1ddb4d7 (Merge branch
'nd/upload-pack-shallow', 2014-03-21).
This looks like an error in manual conflict resolution.
Here's what happened:
1. v1.9.0 shipped with the http tests in t5537.
2. We realized that this caused problems, and built
0232852 on top to move the tests to their own file.
This fix made it into v1.9.1.
3. We later had another fix in nd/upload-pack-shallow that
also touched t5537. It was built directly on v1.9.0.
When we merged nd/upload-pack-shallow to master, we got a
conflict; it was built on a version with the http tests, but
we had since removed them. The correct resolution was to
drop the http tests and keep the new ones, but instead we
kept everything.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5537-fetch-shallow.sh | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh index be951a4..a980574 100755 --- a/t/t5537-fetch-shallow.sh +++ b/t/t5537-fetch-shallow.sh @@ -173,33 +173,6 @@ EOF ) ' -if test -n "$NO_CURL" -o -z "$GIT_TEST_HTTPD"; then - say 'skipping remaining tests, git built without http support' - test_done -fi - -LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5537'} -. "$TEST_DIRECTORY"/lib-httpd.sh -start_httpd - -test_expect_success 'clone http repository' ' - git clone --bare --no-local shallow "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && - git clone $HTTPD_URL/smart/repo.git clone && - ( - cd clone && - git fsck && - git log --format=%s origin/master >actual && - cat <<EOF >expect && -7 -6 -5 -4 -3 -EOF - test_cmp expect actual - ) -' - test_expect_success POSIXPERM,SANITY 'shallow fetch from a read-only repo' ' cp -R .git read-only.git && find read-only.git -print | xargs chmod -w && @@ -213,5 +186,4 @@ EOF test_cmp expect actual ' -stop_httpd test_done |