diff options
| author | Jeff King <peff@peff.net> | 2014-04-02 02:39:17 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-04 15:29:44 -0700 |
| commit | 69e4b3426a608b4965c1cb0c6eab5252d880178b (patch) | |
| tree | cc1ff079a2d89f88fee8e312242900e2b42cb79f | |
| parent | 2db1a43f41880bb4aeea9dee8a7d13c5ad76db3f (diff) | |
| download | git-69e4b3426a608b4965c1cb0c6eab5252d880178b.tar.gz git-69e4b3426a608b4965c1cb0c6eab5252d880178b.tar.xz | |
pack-objects: do not reuse packfiles without --delta-base-offset
When we are sending a packfile to a remote, we currently try
to reuse a whole chunk of packfile without bothering to look
at the individual objects. This can make things like initial
clones much lighter on the server, as we can just dump the
packfile bytes.
However, it's possible that the other side cannot read our
packfile verbatim. For example, we may have objects stored
as OFS_DELTA, but the client is an antique version of git
that only understands REF_DELTA. We negotiate this
capability over the fetch protocol. A normal pack-objects
run will convert OFS_DELTA into REF_DELTA on the fly, but
the "reuse pack" code path never even looks at the objects.
This patch disables packfile reuse if the other side is
missing any capabilities that we might have used in the
on-disk pack. Right now the only one is OFS_DELTA, but we
may need to expand in the future (e.g., if packv4 introduces
new object types).
We could be more thorough and only disable reuse in this
case when we actually have an OFS_DELTA to send, but:
1. We almost always will have one, since we prefer
OFS_DELTA to REF_DELTA when possible. So this case
would almost never come up.
2. Looking through the objects defeats the purpose of the
optimization, which is to do as little work as possible
to get the bytes to the remote.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/pack-objects.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 50d794f5d..c7590cb65 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2434,12 +2434,23 @@ static void loosen_unused_packed_objects(struct rev_info *revs) } } +/* + * This tracks any options which a reader of the pack might + * not understand, and which would therefore prevent blind reuse + * of what we have on disk. + */ +static int pack_options_allow_reuse(void) +{ + return allow_ofs_delta; +} + static int get_object_list_from_bitmap(struct rev_info *revs) { if (prepare_bitmap_walk(revs) < 0) return -1; - if (!reuse_partial_packfile_from_bitmap( + if (pack_options_allow_reuse() && + !reuse_partial_packfile_from_bitmap( &reuse_packfile, &reuse_packfile_objects, &reuse_packfile_offset)) { |