mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sp/missing-thin-base' into maint

Browse Source 
* sp/missing-thin-base:
  pack-objects: Allow missing base objects when creating thin packs
This commit is contained in:
Junio C Hamano
2008-08-30 08:38:19 -07:00
parent 014aff7c92 6d6f9cddbe
commit df85f7855d
2 changed files with 91 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
builtin-pack-objects.c
View File

@ -1095,9 +1095,12 @@ static void check_object(struct object_entry *entry)
}
entry->type = sha1_object_info(entry->idx.sha1, &entry->size);
if (entry->type < 0)
die("unable to get type of object %s",
sha1_to_hex(entry->idx.sha1));
/*
* The error condition is checked in prepare_pack(). This is
* to permit a missing preferred base object to be ignored
* as a preferred base. Doing so can result in a larger
* pack file, but the transfer will still take place.
*/
}
static int pack_offset_sort(const void *_a, const void *_b)
@ -1721,8 +1724,12 @@ static void prepare_pack(int window, int depth)
if (entry->no_try_delta)
continue;
if (!entry->preferred_base)
if (!entry->preferred_base) {
nr_deltas++;
if (entry->type < 0)
die("unable to get type of object %s",
sha1_to_hex(entry->idx.sha1));
}
delta_list[n++] = entry;
}