summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-06 13:11:25 +0900
committerJunio C Hamano <gitster@pobox.com>2017-09-06 13:11:25 +0900
commit8b36f0b196225fc25588220acf921d011d4bf9a7 (patch)
tree092fe8f849f4d077323f9546624975b936e05932 /commit.h
parent1fb77b3ee5417e7b6af782e43c8b98256861cca5 (diff)
parentcfa5bf16082e25c9221e26851ca890f71ddf5a5f (diff)
downloadgit-8b36f0b196225fc25588220acf921d011d4bf9a7.tar.gz
Merge branch 'po/read-graft-line'
Conversion from uchar[20] to struct object_id continues; this is to ensure that we do not assume sizeof(struct object_id) is the same as the length of SHA-1 hash (or length of longest hash we support). * po/read-graft-line: commit: rewrite read_graft_line commit: allocate array using object_id size commit: replace the raw buffer with strbuf in read_graft_line sha1_file: fix definition of null_sha1
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 1283d2a51f..6d769590f2 100644
--- a/commit.h
+++ b/commit.h
@@ -247,7 +247,7 @@ struct commit_graft {
};
typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
-struct commit_graft *read_graft_line(char *buf, int len);
+struct commit_graft *read_graft_line(struct strbuf *line);
int register_commit_graft(struct commit_graft *, int);
struct commit_graft *lookup_commit_graft(const struct object_id *oid);