diff options
author | Christian Hesse | 2019-02-24 21:19:46 +0100 |
---|---|---|
committer | Christian Hesse | 2019-06-05 15:37:49 +0200 |
commit | 985fba80d06f37fdba5e72d738ce21ab5ab5a76d (patch) | |
tree | d8ce862864ac41701ef9b73c30aa842b3a267b8c /ui-blob.c | |
parent | 68de710c1c0e9b823a156b1398643601a682fbf9 (diff) | |
download | cgit-985fba80d06f37fdba5e72d738ce21ab5ab5a76d.tar.gz cgit-985fba80d06f37fdba5e72d738ce21ab5ab5a76d.tar.bz2 cgit-985fba80d06f37fdba5e72d738ce21ab5ab5a76d.zip |
git: update to v2.21.0
Update to git version v2.21.0. Required changes follow upstream commits:
* 6a7895fd8a3bd409f2b71ffc355d5142172cc2a0
(commit: prepare free_commit_buffer and release_commit_memory for
any repo)
* e092073d643b17c82d72cf692fbfaea9c9796f11
(tree.c: make read_tree*() take 'struct repository *')
Signed-off-by: Christian Hesse <mail@eworm.de>
Reviewed-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'ui-blob.c')
-rw-r--r-- | ui-blob.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -56,7 +56,8 @@ 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(the_repository, &oid)->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | 59 | read_tree_recursive(the_repository, lookup_commit_reference(the_repository, &oid)->maybe_tree, |
60 | "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | ||
60 | 61 | ||
61 | done: | 62 | done: |
62 | free(path_items.match); | 63 | free(path_items.match); |
@@ -90,7 +91,8 @@ int cgit_print_file(char *path, const char *head, int file_only) | |||
90 | type = oid_object_info(the_repository, &oid, &size); | 91 | type = oid_object_info(the_repository, &oid, &size); |
91 | if (type == OBJ_COMMIT) { | 92 | if (type == OBJ_COMMIT) { |
92 | commit = lookup_commit_reference(the_repository, &oid); | 93 | commit = lookup_commit_reference(the_repository, &oid); |
93 | read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | 94 | read_tree_recursive(the_repository, commit->maybe_tree, |
95 | "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | ||
94 | if (!walk_tree_ctx.found_path) | 96 | if (!walk_tree_ctx.found_path) |
95 | return -1; | 97 | return -1; |
96 | type = oid_object_info(the_repository, &oid, &size); | 98 | type = oid_object_info(the_repository, &oid, &size); |
@@ -146,7 +148,8 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl | |||
146 | 148 | ||
147 | if ((!hex) && type == OBJ_COMMIT && path) { | 149 | if ((!hex) && type == OBJ_COMMIT && path) { |
148 | commit = lookup_commit_reference(the_repository, &oid); | 150 | commit = lookup_commit_reference(the_repository, &oid); |
149 | read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | 151 | read_tree_recursive(the_repository, commit->maybe_tree, |
152 | "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | ||
150 | type = oid_object_info(the_repository, &oid, &size); | 153 | type = oid_object_info(the_repository, &oid, &size); |
151 | } | 154 | } |
152 | 155 | ||