Merge branch 'jk/misc-uninitialized-fixes'
Various fixes to codepaths gcc 9 had trouble following dataflow. * jk/misc-uninitialized-fixes: pack-objects: drop packlist index_pos optimization test-read-cache: drop namelen variable diff-delta: set size out-parameter to 0 for NULL delta bulk-checkin: zero-initialize hashfile_checkpoint pack-objects: use object_id in packlist_alloc() git-am: handle missing "author" when parsing commit
This commit is contained in:
@ -610,12 +610,12 @@ static int mark_tagged(const char *path, const struct object_id *oid, int flag,
|
||||
void *cb_data)
|
||||
{
|
||||
struct object_id peeled;
|
||||
struct object_entry *entry = packlist_find(&to_pack, oid, NULL);
|
||||
struct object_entry *entry = packlist_find(&to_pack, oid);
|
||||
|
||||
if (entry)
|
||||
entry->tagged = 1;
|
||||
if (!peel_ref(path, &peeled)) {
|
||||
entry = packlist_find(&to_pack, &peeled, NULL);
|
||||
entry = packlist_find(&to_pack, &peeled);
|
||||
if (entry)
|
||||
entry->tagged = 1;
|
||||
}
|
||||
@ -996,12 +996,11 @@ static int no_try_delta(const char *path)
|
||||
* few lines later when we want to add the new entry.
|
||||
*/
|
||||
static int have_duplicate_entry(const struct object_id *oid,
|
||||
int exclude,
|
||||
uint32_t *index_pos)
|
||||
int exclude)
|
||||
{
|
||||
struct object_entry *entry;
|
||||
|
||||
entry = packlist_find(&to_pack, oid, index_pos);
|
||||
entry = packlist_find(&to_pack, oid);
|
||||
if (!entry)
|
||||
return 0;
|
||||
|
||||
@ -1141,13 +1140,12 @@ static void create_object_entry(const struct object_id *oid,
|
||||
uint32_t hash,
|
||||
int exclude,
|
||||
int no_try_delta,
|
||||
uint32_t index_pos,
|
||||
struct packed_git *found_pack,
|
||||
off_t found_offset)
|
||||
{
|
||||
struct object_entry *entry;
|
||||
|
||||
entry = packlist_alloc(&to_pack, oid->hash, index_pos);
|
||||
entry = packlist_alloc(&to_pack, oid);
|
||||
entry->hash = hash;
|
||||
oe_set_type(entry, type);
|
||||
if (exclude)
|
||||
@ -1171,11 +1169,10 @@ static int add_object_entry(const struct object_id *oid, enum object_type type,
|
||||
{
|
||||
struct packed_git *found_pack = NULL;
|
||||
off_t found_offset = 0;
|
||||
uint32_t index_pos;
|
||||
|
||||
display_progress(progress_state, ++nr_seen);
|
||||
|
||||
if (have_duplicate_entry(oid, exclude, &index_pos))
|
||||
if (have_duplicate_entry(oid, exclude))
|
||||
return 0;
|
||||
|
||||
if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset)) {
|
||||
@ -1190,7 +1187,7 @@ static int add_object_entry(const struct object_id *oid, enum object_type type,
|
||||
|
||||
create_object_entry(oid, type, pack_name_hash(name),
|
||||
exclude, name && no_try_delta(name),
|
||||
index_pos, found_pack, found_offset);
|
||||
found_pack, found_offset);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -1199,17 +1196,15 @@ static int add_object_entry_from_bitmap(const struct object_id *oid,
|
||||
int flags, uint32_t name_hash,
|
||||
struct packed_git *pack, off_t offset)
|
||||
{
|
||||
uint32_t index_pos;
|
||||
|
||||
display_progress(progress_state, ++nr_seen);
|
||||
|
||||
if (have_duplicate_entry(oid, 0, &index_pos))
|
||||
if (have_duplicate_entry(oid, 0))
|
||||
return 0;
|
||||
|
||||
if (!want_object_in_pack(oid, 0, &pack, &offset))
|
||||
return 0;
|
||||
|
||||
create_object_entry(oid, type, name_hash, 0, 0, index_pos, pack, offset);
|
||||
create_object_entry(oid, type, name_hash, 0, 0, pack, offset);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -1507,7 +1502,7 @@ static int can_reuse_delta(const unsigned char *base_sha1,
|
||||
* First see if we're already sending the base (or it's explicitly in
|
||||
* our "excluded" list).
|
||||
*/
|
||||
base = packlist_find(&to_pack, &base_oid, NULL);
|
||||
base = packlist_find(&to_pack, &base_oid);
|
||||
if (base) {
|
||||
if (!in_same_island(&delta->idx.oid, &base->idx.oid))
|
||||
return 0;
|
||||
@ -2568,7 +2563,7 @@ static void add_tag_chain(const struct object_id *oid)
|
||||
* it was included via bitmaps, we would not have parsed it
|
||||
* previously).
|
||||
*/
|
||||
if (packlist_find(&to_pack, oid, NULL))
|
||||
if (packlist_find(&to_pack, oid))
|
||||
return;
|
||||
|
||||
tag = lookup_tag(the_repository, oid);
|
||||
@ -2592,7 +2587,7 @@ static int add_ref_tag(const char *path, const struct object_id *oid, int flag,
|
||||
|
||||
if (starts_with(path, "refs/tags/") && /* is a tag? */
|
||||
!peel_ref(path, &peeled) && /* peelable? */
|
||||
packlist_find(&to_pack, &peeled, NULL)) /* object packed? */
|
||||
packlist_find(&to_pack, &peeled)) /* object packed? */
|
||||
add_tag_chain(oid);
|
||||
return 0;
|
||||
}
|
||||
@ -2788,7 +2783,7 @@ static void show_object(struct object *obj, const char *name, void *data)
|
||||
for (p = strchr(name, '/'); p; p = strchr(p + 1, '/'))
|
||||
depth++;
|
||||
|
||||
ent = packlist_find(&to_pack, &obj->oid, NULL);
|
||||
ent = packlist_find(&to_pack, &obj->oid);
|
||||
if (ent && depth > oe_tree_depth(&to_pack, ent))
|
||||
oe_set_tree_depth(&to_pack, ent, depth);
|
||||
}
|
||||
@ -3019,7 +3014,7 @@ static void loosen_unused_packed_objects(void)
|
||||
|
||||
for (i = 0; i < p->num_objects; i++) {
|
||||
nth_packed_object_oid(&oid, p, i);
|
||||
if (!packlist_find(&to_pack, &oid, NULL) &&
|
||||
if (!packlist_find(&to_pack, &oid) &&
|
||||
!has_sha1_pack_kept_or_nonlocal(&oid) &&
|
||||
!loosened_object_can_be_discarded(&oid, p->mtime))
|
||||
if (force_object_loose(&oid, p->mtime))
|
||||
|
||||
Reference in New Issue
Block a user