diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:20:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:20:30 -0700 |
| commit | 305e19bdc315f302b935d50abff4a1a405e14b71 (patch) | |
| tree | f835988777eb607a80e3d6c858829c65ec2d94ad /Documentation | |
| parent | Merge branch 'js/transport-helper-error-reporting-fix' (diff) | |
| parent | t5500: add test for fetching with an unknown 'shallow' (diff) | |
| download | tgif-305e19bdc315f302b935d50abff4a1a405e14b71.tar.xz | |
Merge branch 'mh/fetch-into-shallow'
"git fetch" into a shallow repository from a repository that does
not know about the shallow boundary commits (e.g. a different fork
from the repository the current shallow repository was cloned from)
did not work correctly.
* 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 |