summaryrefslogtreecommitdiff
path: root/Documentation/technical/pack-protocol.txt
diff options
context:
space:
mode:
authorMichael Heemskerk <mheemskerk@atlassian.com>2013-04-29 05:32:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-29 05:33:53 (GMT)
commitaf04fa2a78af3f4dc07bdc3e3018ccf3baa88c20 (patch)
treeef98b2a7d158888c7c6681bb49bbb723265cf0aa /Documentation/technical/pack-protocol.txt
parentb75cdfaa882a00f2274e74b21c1a9927d184ed29 (diff)
downloadgit-af04fa2a78af3f4dc07bdc3e3018ccf3baa88c20.zip
git-af04fa2a78af3f4dc07bdc3e3018ccf3baa88c20.tar.gz
git-af04fa2a78af3f4dc07bdc3e3018ccf3baa88c20.tar.bz2
upload-pack: ignore 'shallow' lines with unknown obj-ids
When the client sends a 'shallow' line for an object that the server does not have, the server currently dies with the error: "did not find object for shallow <obj-id>". The client may have truncated the history at the commit by fetching shallowly from a different server, or the commit may have been garbage collected by the server. In either case, this unknown commit is not relevant for calculating the pack that is to be sent and can be safely ignored, and it is not used when recomputing where the updated history of the client is cauterised. The documentation in technical/pack-protocol.txt has been updated to remove the restriction that "Clients MUST NOT mention an obj-id which it does not know exists on the server". This requirement is not realistic because clients cannot know whether an object has been garbage collected by the server. Signed-off-by: Michael Heemskerk <mheemskerk@atlassian.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/pack-protocol.txt')
-rw-r--r--Documentation/technical/pack-protocol.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index f1a51ed..b898e97 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