author | Junio C Hamano <gitster@pobox.com> | |
Fri, 13 Jan 2012 07:31:05 +0000 (23:31 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 13 Jan 2012 07:31:05 +0000 (23:31 -0800) |
* maint-1.7.6:
Update draft release notes to 1.7.6.6
thin-pack: try harder to use preferred base objects as base
Update draft release notes to 1.7.6.6
thin-pack: try harder to use preferred base objects as base
Documentation/RelNotes/1.7.6.6.txt | patch | blob | history | |
builtin/pack-objects.c | patch | blob | history |
index 13ce2dc2d7823dfd09d97af8826f9fdcfe79672d..5343e004005e888612305742d75cde68ff157846 100644 (file)
directory when two paths in question are in adjacent directories and
the name of the one directory is a prefix of the other.
+ * When producing a "thin pack" (primarily used in bundles and smart
+ HTTP transfers) out of a fully packed repository, we unnecessarily
+ avoided sending recent objects as a delta against objects we know
+ the other side has.
+
Also contains minor fixes and documentation updates.
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 80ab6c39f91b30be90203da777fd8e3989abdc2c..638d43da0e61c67a374ee124faf9391180171b21 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
return -1;
/*
- * We do not bother to try a delta that we discarded
- * on an earlier try, but only when reusing delta data.
+ * We do not bother to try a delta that we discarded on an
+ * earlier try, but only when reusing delta data. Note that
+ * src_entry that is marked as the preferred_base should always
+ * be considered, as even if we produce a suboptimal delta against
+ * it, we will still save the transfer cost, as we already know
+ * the other side has it and we won't send src_entry at all.
*/
if (reuse_delta && trg_entry->in_pack &&
trg_entry->in_pack == src_entry->in_pack &&
+ !src_entry->preferred_base &&
trg_entry->in_pack_type != OBJ_REF_DELTA &&
trg_entry->in_pack_type != OBJ_OFS_DELTA)
return 0;