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 /fetch-pack.c | |
| parent | 0f9e62e0847c075678a7a5a748567d1e881d16f8 (diff) | |
| parent | 0232852b06cb000a3b1f5f48676c8b4d084f18ea (diff) | |
| download | git-2de34784dfcbb4fe0febe9ab98e0b99138040109.tar.gz | |
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 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 90fdd49821..f061f1fe85 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -439,7 +439,8 @@ done: } strbuf_release(&req_buf); - consume_shallow_list(args, fd[0]); + if (!got_ready || !no_done) + consume_shallow_list(args, fd[0]); while (flushes || multi_ack) { int ack = get_ack(fd[0], result_sha1); if (ack) { |