diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:37:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:37:41 -0700 |
| commit | 0fb2c97c206958a13e8979187b7b3cc31d389126 (patch) | |
| tree | 83687d7743812157c37fd644127ba47844f441f3 /Documentation | |
| parent | Merge branch 'jh/checkout-auto-tracking' into maint (diff) | |
| parent | t5500: add test for fetching with an unknown 'shallow' (diff) | |
| download | tgif-0fb2c97c206958a13e8979187b7b3cc31d389126.tar.xz | |
Merge branch 'mh/fetch-into-shallow' into maint
* mh/fetch-into-shallow:
t5500: add test for fetching with an unknown 'shallow'
upload-pack: ignore 'shallow' lines with unknown obj-ids
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/technical/pack-protocol.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt index f1a51edf47..b898e97988 100644 --- a/Documentation/technical/pack-protocol.txt +++ b/Documentation/technical/pack-protocol.txt @@ -228,8 +228,7 @@ obtained through ref discovery. The client MUST write all obj-ids which it only has shallow copies of (meaning that it does not have the parents of a commit) as 'shallow' lines so that the server is aware of the limitations of -the client's history. Clients MUST NOT mention an obj-id which -it does not know exists on the server. +the client's history. The client now sends the maximum commit history depth it wants for this transaction, which is the number of commits it wants from the |