Merge branch 'bc/object-id'
Identify parts of the code that knows that we use SHA-1 hash to name our objects too much, and use (1) symbolic constants instead of hardcoded 20 as byte count and/or (2) use struct object_id instead of unsigned char [20] for object names. * bc/object-id: apply: convert threeway_stage to object_id patch-id: convert to use struct object_id commit: convert parts to struct object_id diff: convert struct combine_diff_path to object_id bulk-checkin.c: convert to use struct object_id zip: use GIT_SHA1_HEXSZ for trailers archive.c: convert to use struct object_id bisect.c: convert leaf functions to use struct object_id define utility functions for object IDs define a structure for object IDs
This commit is contained in:
4
commit.h
4
commit.h
@ -226,9 +226,9 @@ enum rev_sort_order {
|
||||
void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
|
||||
|
||||
struct commit_graft {
|
||||
unsigned char sha1[20];
|
||||
struct object_id oid;
|
||||
int nr_parent; /* < 0 if shallow commit */
|
||||
unsigned char parent[FLEX_ARRAY][20]; /* more */
|
||||
struct object_id parent[FLEX_ARRAY]; /* more */
|
||||
};
|
||||
typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user