[PATCH v2 10/16] pack-objects: exclude commits out of delta objects in v4
STALE3761d
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:58:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v2 of 2 in this series.
Revisions (2)
- v1 [diff vs current]
- v2 current
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- builtin/pack-objects.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 9613732..fb2394d 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c@@ -1329,7 +1329,8 @@ static void check_object(struct object_entry *entry) break; } - if (base_ref && (base_entry = locate_object_entry(base_ref))) { + if (base_ref && (base_entry = locate_object_entry(base_ref)) && + (pack_version < 4 || entry->type != OBJ_COMMIT)) { /* * If base_ref was set above that means we wish to * reuse delta data, and we even found that base
@@ -1413,6 +1414,8 @@ static void get_object_details(void) check_object(entry); if (big_file_threshold < entry->size) entry->no_try_delta = 1; + if (pack_version == 4 && entry->type == OBJ_COMMIT) + entry->no_try_delta = 1; } free(sorted_by_offset);
--
1.8.2.83.gc99314b