global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 18:59:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'np/pack' into next

Browse Source 
* np/pack:
  allow delta data reuse even if base object is a preferred base
  zap a debug remnant
This commit is contained in:
Junio C Hamano
2006-09-27 18:02:20 -07:00
parent 40e6c01fac a270069699
commit 92cad30186
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin-pack-objects.c
View File

@@ -440,7 +440,6 @@ static unsigned long write_object(struct sha1file *f,
+ entry->in_pack_header_size;
datalen = find_packed_object_size(p, entry->in_pack_offset)
- entry->in_pack_header_size;
//fprintf(stderr, "reusing %d at %d header %d size %d\n", obj_type, entry->in_pack_offset, entry->in_pack_header_size, datalen);
if (!pack_to_stdout && check_inflate(buf, datalen, entry->size))
die("corrupt delta in pack %s", sha1_to_hex(entry->sha1));
sha1write(f, buf, datalen);
@@ -989,7 +988,7 @@ static void check_object(struct object_entry *entry)
unuse_packed_git(p);
entry->in_pack_header_size = used;
if (base_entry && !base_entry->preferred_base) {
if (base_entry) {
/* Depth value does not matter - find_deltas()
* will never consider reused delta as the