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 /builtin/merge-ours.c | |
| 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 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions