summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-11 13:26:55 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-11 13:26:55 -0700
commit3943f6caaa7613145448ebdca181e1feaf941a02 (patch)
treef323116aa615c2a60cf57f9faed3435dd8a4a870 /commit.h
parent4274c698f46a9bc45834c4904e7e113450c042fb (diff)
parent84571760ca96d244e4fff06819fab119947d792e (diff)
downloadgit-3943f6caaa7613145448ebdca181e1feaf941a02.tar.gz
Merge branch 'sb/object-id'
Conversion from uchar[20] to struct object_id continues. * sb/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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/commit.h b/commit.h
index 4127c298cb..6d857f06c1 100644
--- a/commit.h
+++ b/commit.h
@@ -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);