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

patch-ids: convert to struct object_id

Browse Source 
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams
2017-05-30 10:30:53 -07:00
committed by Junio C Hamano
parent 74014152be
commit 34f3c0ebfb
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/log.c
View File

@ -1354,7 +1354,7 @@ static void prepare_bases(struct base_tree_info *bases,
struct object_id *patch_id; struct object_id *patch_id;
if (commit->util) if (commit->util)
continue; continue;
if (commit_patch_id(commit, &diffopt, oid.hash, 0)) if (commit_patch_id(commit, &diffopt, &oid, 0))
die(_("cannot get patch id")); die(_("cannot get patch id"));
ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id); ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id);
patch_id = bases->patch_id + bases->nr_patch_id; patch_id = bases->patch_id + bases->nr_patch_id;

20
patch-ids.c
View File

@ -11,7 +11,7 @@ static int patch_id_defined(struct commit *commit)
} }
int commit_patch_id(struct commit *commit, struct diff_options *options, int commit_patch_id(struct commit *commit, struct diff_options *options,
unsigned char *sha1, int diff_header_only) struct object_id *oid, int diff_header_only)
{ {
if (!patch_id_defined(commit)) if (!patch_id_defined(commit))
return -1; return -1;
@ -22,7 +22,7 @@ int commit_patch_id(struct commit *commit, struct diff_options *options,
else else
diff_root_tree_sha1(commit->object.oid.hash, "", options); diff_root_tree_sha1(commit->object.oid.hash, "", options);
diffcore_std(options); diffcore_std(options);
return diff_flush_patch_id(options, sha1, diff_header_only); return diff_flush_patch_id(options, oid->hash, diff_header_only);
} }
/* /*
@ -39,15 +39,15 @@ static int patch_id_cmp(struct patch_id *a,
struct patch_id *b, struct patch_id *b,
struct diff_options *opt) struct diff_options *opt)
{ {
if (is_null_sha1(a->patch_id) && if (is_null_oid(&a->patch_id) &&
commit_patch_id(a->commit, opt, a->patch_id, 0)) commit_patch_id(a->commit, opt, &a->patch_id, 0))
return error("Could not get patch ID for %s", return error("Could not get patch ID for %s",
oid_to_hex(&a->commit->object.oid)); oid_to_hex(&a->commit->object.oid));
if (is_null_sha1(b->patch_id) && if (is_null_oid(&b->patch_id) &&
commit_patch_id(b->commit, opt, b->patch_id, 0)) commit_patch_id(b->commit, opt, &b->patch_id, 0))
return error("Could not get patch ID for %s", return error("Could not get patch ID for %s",
oid_to_hex(&b->commit->object.oid)); oid_to_hex(&b->commit->object.oid));
return hashcmp(a->patch_id, b->patch_id); return oidcmp(&a->patch_id, &b->patch_id);
} }
int init_patch_ids(struct patch_ids *ids) int init_patch_ids(struct patch_ids *ids)
@ -71,13 +71,13 @@ static int init_patch_id_entry(struct patch_id *patch,
struct commit *commit, struct commit *commit,
struct patch_ids *ids) struct patch_ids *ids)
{ {
unsigned char header_only_patch_id[GIT_MAX_RAWSZ]; struct object_id header_only_patch_id;
patch->commit = commit; patch->commit = commit;
if (commit_patch_id(commit, &ids->diffopts, header_only_patch_id, 1)) if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1))
return -1; return -1;
hashmap_entry_init(patch, sha1hash(header_only_patch_id)); hashmap_entry_init(patch, sha1hash(header_only_patch_id.hash));
return 0; return 0;
} }

4
patch-ids.h
View File

@ -3,7 +3,7 @@
struct patch_id { struct patch_id {
struct hashmap_entry ent; struct hashmap_entry ent;
unsigned char patch_id[GIT_MAX_RAWSZ]; struct object_id patch_id;
struct commit *commit; struct commit *commit;
}; };
@ -13,7 +13,7 @@ struct patch_ids {
}; };
int commit_patch_id(struct commit *commit, struct diff_options *options, int commit_patch_id(struct commit *commit, struct diff_options *options,
unsigned char *sha1, int); struct object_id *oid, int);
int init_patch_ids(struct patch_ids *); int init_patch_ids(struct patch_ids *);
int free_patch_ids(struct patch_ids *); int free_patch_ids(struct patch_ids *);
struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *); struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);