diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:50 -0800 |
| commit | 2de34784dfcbb4fe0febe9ab98e0b99138040109 (patch) | |
| tree | 37dfa896cde52f7cfdcf243be8455bdaa0c596c4 /t/t5537-fetch-shallow.sh | |
| parent | Merge branch 'jk/pack-bitmap' (diff) | |
| parent | t5537: move http tests out to t5539 (diff) | |
| download | tgif-2de34784dfcbb4fe0febe9ab98e0b99138040109.tar.xz | |
Merge branch 'nd/http-fetch-shallow-fix'
Attempting to deepen a shallow repository by fetching over smart
HTTP transport failed in the protocol exchange, when no-done
extension was used. The fetching side waited for the list of
shallow boundary commits after the sending end stopped talking to
it.
* nd/http-fetch-shallow-fix:
t5537: move http tests out to t5539
fetch-pack: fix deepen shallow over smart http with no-done cap
protocol-capabilities.txt: document no-done
protocol-capabilities.txt: refer multi_ack_detailed back to pack-protocol.txt
pack-protocol.txt: clarify 'obj-id' in the last ACK after 'done'
test: rename http fetch and push test files
Diffstat (limited to 't/t5537-fetch-shallow.sh')
| -rwxr-xr-x | t/t5537-fetch-shallow.sh | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh index adf215a193..3ae9092f5c 100755 --- a/t/t5537-fetch-shallow.sh +++ b/t/t5537-fetch-shallow.sh @@ -173,31 +173,4 @@ EOF ) ' -if test -n "$NO_CURL" -o -z "$GIT_TEST_HTTPD"; then - say 'skipping remaining tests, git built without http support' - test_done -fi - -. "$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 - ) -' - -stop_httpd test_done |