From: Junio C Hamano <junkio@cox.net>
Date: Mon, 17 Jul 2006 22:06:23 +0000 (-0700)
Subject: pack-objects: reuse deflated data from new-style loose objects.
X-Git-Tag: v1.4.3-rc1~270^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ceec1361ebbc4613813ba42976503f5e304cfacf;p=git.git

pack-objects: reuse deflated data from new-style loose objects.

When packing an object without deltifying, if the data is stored in
a loose object that is encoded with a new style header, copy it without
inflating and deflating.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/pack-objects.c b/pack-objects.c
index 861c7f08f..e52e9774e 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -269,6 +269,22 @@ static unsigned long write_object(struct sha1file *f,
 				 * and we do not need to deltify it.
 				 */
 
+	if (!entry->in_pack && !entry->delta) {
+		unsigned char *map;
+		unsigned long mapsize;
+		map = map_sha1_file(entry->sha1, &mapsize);
+		if (map && !legacy_loose_object(map)) {
+			/* We can copy straight into the pack file */
+			sha1write(f, map, mapsize);
+			munmap(map, mapsize);
+			written++;
+			reused++;
+			return mapsize;
+		}
+		if (map)
+			munmap(map, mapsize);
+	}
+
 	if (! to_reuse) {
 		buf = read_sha1_file(entry->sha1, type, &size);
 		if (!buf)