diff options
author | Christian Hesse | 2018-08-28 18:27:00 +0200 |
---|---|---|
committer | Christian Hesse | 2018-10-12 23:06:02 +0200 |
commit | 2c9f56f3e1c754f60ccffbc6c745b9d5a81ea005 (patch) | |
tree | 283e8808868837a7156dc9f1b745a978ba6f2bf0 /ui-blob.c | |
parent | a96f2890f41e0b9b0ffa1bcdb1dddbef28c01662 (diff) | |
download | cgit-2c9f56f3e1c754f60ccffbc6c745b9d5a81ea005.tar.gz cgit-2c9f56f3e1c754f60ccffbc6c745b9d5a81ea005.tar.bz2 cgit-2c9f56f3e1c754f60ccffbc6c745b9d5a81ea005.zip |
git: update to v2.19.1
Update to git version v2.19.1. Required changes follow upstream commits:
* commit: add repository argument to get_cached_commit_buffer
(3ce85f7e5a41116145179f0fae2ce6d86558d099)
* commit: add repository argument to lookup_commit_reference
(2122f6754c93be8f02bfb5704ed96c88fc9837a8)
* object: add repository argument to parse_object
(109cd76dd3467bd05f8d2145b857006649741d5c)
* tag: add repository argument to deref_tag
(a74093da5ed601a09fa158e5ba6f6f14c1142a3e)
* tag: add repository argument to lookup_tag
(ce71efb713f97f476a2d2ab541a0c73f684a5db3)
* tree: add repository argument to lookup_tree
(f86bcc7b2ce6cad68ba1a48a528e380c6126705e)
* archive.c: avoid access to the_index
(b612ee202a48f129f81f8f6a5af6cf71d1a9caef)
* for_each_*_object: move declarations to object-store.h
(0889aae1cd18c1804ba01c1a4229e516dfb9fe9b)
Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'ui-blob.c')
-rw-r--r-- | ui-blob.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -56,7 +56,7 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only) | |||
56 | goto done; | 56 | goto done; |
57 | if (oid_object_info(the_repository, &oid, &size) != OBJ_COMMIT) | 57 | if (oid_object_info(the_repository, &oid, &size) != OBJ_COMMIT) |
58 | goto done; | 58 | goto done; |
59 | read_tree_recursive(lookup_commit_reference(&oid)->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | 59 | read_tree_recursive(lookup_commit_reference(the_repository, &oid)->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); |
60 | 60 | ||
61 | done: | 61 | done: |
62 | free(path_items.match); | 62 | free(path_items.match); |
@@ -89,7 +89,7 @@ int cgit_print_file(char *path, const char *head, int file_only) | |||
89 | return -1; | 89 | return -1; |
90 | type = oid_object_info(the_repository, &oid, &size); | 90 | type = oid_object_info(the_repository, &oid, &size); |
91 | if (type == OBJ_COMMIT) { | 91 | if (type == OBJ_COMMIT) { |
92 | commit = lookup_commit_reference(&oid); | 92 | commit = lookup_commit_reference(the_repository, &oid); |
93 | read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | 93 | read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); |
94 | if (!walk_tree_ctx.found_path) | 94 | if (!walk_tree_ctx.found_path) |
95 | return -1; | 95 | return -1; |
@@ -145,7 +145,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl | |||
145 | type = oid_object_info(the_repository, &oid, &size); | 145 | type = oid_object_info(the_repository, &oid, &size); |
146 | 146 | ||
147 | if ((!hex) && type == OBJ_COMMIT && path) { | 147 | if ((!hex) && type == OBJ_COMMIT && path) { |
148 | commit = lookup_commit_reference(&oid); | 148 | commit = lookup_commit_reference(the_repository, &oid); |
149 | read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | 149 | read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); |
150 | type = oid_object_info(the_repository, &oid, &size); | 150 | type = oid_object_info(the_repository, &oid, &size); |
151 | } | 151 | } |