diff options
author | Christian Hesse | 2018-06-04 18:49:28 +0200 |
---|---|---|
committer | Jason A. Donenfeld | 2018-06-27 18:13:03 +0200 |
commit | 255b78ff5291cef79978b025c9872f801de89e23 (patch) | |
tree | 7938fdb3af17e39507d282595e1591b0984cc2ec /ui-log.c | |
parent | 54d37dc154f5308459df0a90c81dabd0245b6c17 (diff) | |
download | cgit-255b78ff5291cef79978b025c9872f801de89e23.tar.gz cgit-255b78ff5291cef79978b025c9872f801de89e23.tar.bz2 cgit-255b78ff5291cef79978b025c9872f801de89e23.zip |
git: update to v2.18.0
Update to git version v2.18.0. Required changes follow upstream commits:
* Convert find_unique_abbrev* to struct object_id
(aab9583f7b5ea5463eb3f653a0b4ecac7539dc94)
* sha1_file: convert read_sha1_file to struct object_id
(b4f5aca40e6f77cbabcbf4ff003c3cf30a1830c8)
* sha1_file: convert sha1_object_info* to object_id
(abef9020e3df87c441c9a3a95f592fce5fa49bb9)
* object-store: move packed_git and packed_git_mru to object store
(a80d72db2a73174b3f22142eb2014b33696fd795)
* treewide: rename tree to maybe_tree
(891435d55da80ca3654b19834481205be6bdfe33)
The changed data types required some of our own functions to be converted
to struct object_id:
ls_item
print_dir
print_dir_entry
print_object
single_tree_cb
walk_tree
write_tree_link
And finally we use new upstream functions that were added for
struct object_id:
hashcpy -> oidcpy
sha1_to_hex -> oid_to_hex
Signed-off-by: Christian Hesse <mail@eworm.de>
Reviewed-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'ui-log.c')
-rw-r--r-- | ui-log.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -153,8 +153,8 @@ static int show_commit(struct commit *commit, struct rev_info *revs) | |||
153 | rem_lines = 0; | 153 | rem_lines = 0; |
154 | 154 | ||
155 | revs->diffopt.flags.recursive = 1; | 155 | revs->diffopt.flags.recursive = 1; |
156 | diff_tree_oid(&parent->tree->object.oid, | 156 | diff_tree_oid(&parent->maybe_tree->object.oid, |
157 | &commit->tree->object.oid, | 157 | &commit->maybe_tree->object.oid, |
158 | "", &revs->diffopt); | 158 | "", &revs->diffopt); |
159 | diffcore_std(&revs->diffopt); | 159 | diffcore_std(&revs->diffopt); |
160 | 160 | ||