diff options
author | Jeff Smith | 2017-08-09 19:02:56 -0500 |
---|---|---|
committer | Jason A. Donenfeld | 2017-08-10 15:58:24 +0200 |
commit | 86a6d358f7a6c2432fde86b9e3c5011a656f20e4 (patch) | |
tree | 0f43ea3514fba419d5a5d99cf731f96daa2765c0 /ui-blob.c | |
parent | 3d33b46df24d4dee140d0aafb1eba5fffa314cf0 (diff) | |
download | cgit-86a6d358f7a6c2432fde86b9e3c5011a656f20e4.tar.gz cgit-86a6d358f7a6c2432fde86b9e3c5011a656f20e4.tar.bz2 cgit-86a6d358f7a6c2432fde86b9e3c5011a656f20e4.zip |
git: update to v2.14
Numerous changes were made to git functions to use an object_id
structure rather than sending sha1 hashes as raw unsigned character
arrays. The functions that affect cgit are: parse_object,
lookup_commit_reference, lookup_tag, lookup_tree, parse_tree_indirect,
diff_root_tree_sha1, diff_tree_sha1, and format_display_notes.
Commit b2141fc (config: don't include config.h by default) made it
necessary to that config.h be explicitly included when needed.
Commit 07a3d41 (grep: remove regflags from the public grep_opt API)
removed one way of specifying the ignore-case grep option.
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
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 (sha1_object_info(oid.hash, &size) != OBJ_COMMIT) | 57 | if (sha1_object_info(oid.hash, &size) != OBJ_COMMIT) |
58 | goto done; | 58 | goto done; |
59 | read_tree_recursive(lookup_commit_reference(oid.hash)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | 59 | read_tree_recursive(lookup_commit_reference(&oid)->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 = sha1_object_info(oid.hash, &size); | 90 | type = sha1_object_info(oid.hash, &size); |
91 | if (type == OBJ_COMMIT) { | 91 | if (type == OBJ_COMMIT) { |
92 | commit = lookup_commit_reference(oid.hash); | 92 | commit = lookup_commit_reference(&oid); |
93 | read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | 93 | read_tree_recursive(commit->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 = sha1_object_info(oid.hash, &size); | 145 | type = sha1_object_info(oid.hash, &size); |
146 | 146 | ||
147 | if ((!hex) && type == OBJ_COMMIT && path) { | 147 | if ((!hex) && type == OBJ_COMMIT && path) { |
148 | commit = lookup_commit_reference(oid.hash); | 148 | commit = lookup_commit_reference(&oid); |
149 | read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | 149 | read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); |
150 | type = sha1_object_info(oid.hash, &size); | 150 | type = sha1_object_info(oid.hash, &size); |
151 | } | 151 | } |