diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-13 02:33:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-13 02:33:16 (GMT) |
| commit | 647377c4c91064fc5001acddd5357467c0da6ef9 (patch) | |
| tree | ef5ee52aaf3b2f0b8e070153b47b9248aa32eed5 /builtin-pack-objects.c | |
| parent | eb4541569d4fdfb1cbdf503cfbf433e63d79b663 (diff) | |
| parent | 8e27364128b091e76059229d4f009bc7f869fa9f (diff) | |
| download | git-647377c4c91064fc5001acddd5357467c0da6ef9.zip git-647377c4c91064fc5001acddd5357467c0da6ef9.tar.gz git-647377c4c91064fc5001acddd5357467c0da6ef9.tar.bz2 | |
Merge branch 'jc/pack-objects'
Diffstat (limited to 'builtin-pack-objects.c')
| -rw-r--r-- | builtin-pack-objects.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 2301cd5..2f99212 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -270,6 +270,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) |