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

pack: convert struct pack_idx_entry to struct object_id

Browse Source 
Convert struct pack_idx_entry to use struct object_id by changing the
definition and applying the following semantic patch, plus the standard
object_id transforms:

@@
struct pack_idx_entry E1;
@@
- E1.sha1
+ E1.oid.hash

@@
struct pack_idx_entry *E1;
@@
- E1->sha1
+ E1->oid.hash

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2017-05-06 22:10:11 +00:00
committed by Junio C Hamano
parent bc83266abe
commit e6a492b7be
8 changed files with 89 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pack-bitmap-write.c
View File

@ -73,7 +73,8 @@ void bitmap_writer_build_type_index(struct pack_idx_entry **index,
break;
default:
real_type = sha1_object_info(entry->idx.sha1, NULL);
real_type = sha1_object_info(entry->idx.oid.hash,
NULL);
break;
}
@ -96,7 +97,8 @@ void bitmap_writer_build_type_index(struct pack_idx_entry **index,
default:
die("Missing type information for %s (%d/%d)",
sha1_to_hex(entry->idx.sha1), real_type, entry->type);
oid_to_hex(&entry->idx.oid), real_type,
entry->type);
}
}
}
@ -459,7 +461,7 @@ static inline void dump_bitmap(struct sha1file *f, struct ewah_bitmap *bitmap)
static const unsigned char *sha1_access(size_t pos, void *table)
{
struct pack_idx_entry **index = table;
return index[pos]->sha1;
return index[pos]->oid.hash;
}
static void write_selected_commits_v1(struct sha1file *f,