diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-08-02 14:34:28 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-08-02 14:34:28 -0700 |
commit | a46ddc992bbac524fb325875c5555dbae0c6355b (patch) | |
tree | ce0aa8084f9cbd2734ee56e24caf1017bb635ffb /commit.h | |
parent | dcc6108c3fca6ad3cc4e211a939e8de5c796fa68 (diff) | |
parent | ac53fe860147636cd8671efe26bd002a6cb5cd13 (diff) | |
download | git-a46ddc992bbac524fb325875c5555dbae0c6355b.tar.gz |
Merge branch 'bc/object-id' into bw/submodule-config-cleanup
* bc/object-id:
sha1_name: convert uses of 40 to GIT_SHA1_HEXSZ
sha1_name: convert GET_SHA1* flags to GET_OID*
sha1_name: convert get_sha1* to get_oid*
Convert remaining callers of get_sha1 to get_oid.
builtin/unpack-file: convert to struct object_id
bisect: convert bisect_checkout to struct object_id
builtin/update_ref: convert to struct object_id
sequencer: convert to struct object_id
remote: convert struct push_cas to struct object_id
submodule: convert submodule config lookup to use object_id
builtin/merge-tree: convert remaining caller of get_sha1 to object_id
builtin/fsck: convert remaining caller of get_sha1 to object_id
tag: convert gpg_verify_tag to use struct object_id
commit: convert lookup_commit_graft to struct object_id
Diffstat (limited to 'commit.h')
-rw-r--r-- | commit.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -249,7 +249,7 @@ typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *); struct commit_graft *read_graft_line(char *buf, int len); int register_commit_graft(struct commit_graft *, int); -struct commit_graft *lookup_commit_graft(const unsigned char *sha1); +struct commit_graft *lookup_commit_graft(const struct object_id *oid); extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2); extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos); |