Re: [PATCH] t5537: re-drop http tests
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:01:26
Jeff King [off-list ref] writes:
And a final side note. If you retry the merge by: m=1ddb4d7 git checkout $m^1 git merge $m^2 you can see the resulting conflict is quite tricky to understand.... Viewing it with diff3 conflict-style makes it much more obvious.
Yes, that was a clear mismerge on my side; thanks for catching it.
quoted hunk
t/t5537-fetch-shallow.sh | 28 ---------------------------- 1 file changed, 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