Skip to content

Commit d717282

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e156455 commit d717282

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

t/t5537-fetch-shallow.sh

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -173,33 +173,6 @@ EOF
173173
)
174174
'
175175

176-
if test -n "$NO_CURL" -o -z "$GIT_TEST_HTTPD"; then
177-
say 'skipping remaining tests, git built without http support'
178-
test_done
179-
fi
180-
181-
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5537'}
182-
. "$TEST_DIRECTORY"/lib-httpd.sh
183-
start_httpd
184-
185-
test_expect_success 'clone http repository' '
186-
git clone --bare --no-local shallow "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
187-
git clone $HTTPD_URL/smart/repo.git clone &&
188-
(
189-
cd clone &&
190-
git fsck &&
191-
git log --format=%s origin/master >actual &&
192-
cat <<EOF >expect &&
193-
7
194-
6
195-
5
196-
4
197-
3
198-
EOF
199-
test_cmp expect actual
200-
)
201-
'
202-
203176
test_expect_success POSIXPERM,SANITY 'shallow fetch from a read-only repo' '
204177
cp -R .git read-only.git &&
205178
find read-only.git -print | xargs chmod -w &&
@@ -213,5 +186,4 @@ EOF
213186
test_cmp expect actual
214187
'
215188

216-
stop_httpd
217189
test_done

0 commit comments

Comments
 (0)