Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
---
builtin/pack-objects.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 69a22c1..665853d 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1759,8 +1759,12 @@ static void find_deltas(struct object_entry **list, unsigned *list_size,
* and therefore it is best to go to the write phase ASAP
* instead, as we can afford spending more time compressing
* between writes at that moment.
+ *
+ * For v4 trees we'll need to delta differently anyway
+ * so no cache. v4 commits simply do not delta.
*/
- if (entry->delta_data && !pack_to_stdout) {
+ if (entry->delta_data && !pack_to_stdout &&
+ (pack_version < 4 || entry->type == OBJ_BLOB)) {
entry->z_delta_size = do_compress(&entry->delta_data,
entry->delta_size);
cache_lock();
--
1.8.2.83.gc99314b
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html