diff options
author | Christian Hesse | 2016-01-05 07:38:53 +0100 |
---|---|---|
committer | Jason A. Donenfeld | 2016-01-13 17:12:17 +0100 |
commit | 559ab5ecc4445c8477ecf62c9fc97efa412dd562 (patch) | |
tree | ef19237ed99976f886ad6ca660f9a9961b4e656a /parsing.c | |
parent | 6edc84bc44d55d7f90a40238ae2107913e15f54b (diff) | |
download | cgit-559ab5ecc4445c8477ecf62c9fc97efa412dd562.tar.gz cgit-559ab5ecc4445c8477ecf62c9fc97efa412dd562.tar.bz2 cgit-559ab5ecc4445c8477ecf62c9fc97efa412dd562.zip |
git: update to v2.7.0
Update to git version v2.7.0.
* Upstream commit ed1c9977cb1b63e4270ad8bdf967a2d02580aa08 (Remove
get_object_hash.) changed API:
Convert all instances of get_object_hash to use an appropriate
reference to the hash member of the oid member of struct object.
This provides no functional change, as it is essentially a macro
substitution.
Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'parsing.c')
-rw-r--r-- | parsing.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -139,7 +139,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
139 | return ret; | 139 | return ret; |
140 | 140 | ||
141 | if (!skip_prefix(p, "tree ", &p)) | 141 | if (!skip_prefix(p, "tree ", &p)) |
142 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); | 142 | die("Bad commit: %s", oid_to_hex(&commit->object.oid)); |
143 | p += sha1hex_len + 1; | 143 | p += sha1hex_len + 1; |
144 | 144 | ||
145 | while (skip_prefix(p, "parent ", &p)) | 145 | while (skip_prefix(p, "parent ", &p)) |
@@ -199,7 +199,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag) | |||
199 | const char *p; | 199 | const char *p; |
200 | struct taginfo *ret = NULL; | 200 | struct taginfo *ret = NULL; |
201 | 201 | ||
202 | data = read_sha1_file(tag->object.sha1, &type, &size); | 202 | data = read_sha1_file(tag->object.oid.hash, &type, &size); |
203 | if (!data || type != OBJ_TAG) | 203 | if (!data || type != OBJ_TAG) |
204 | goto cleanup; | 204 | goto cleanup; |
205 | 205 | ||