diff options
author | Christian Hesse | 2017-07-24 17:22:52 +0200 |
---|---|---|
committer | Lukas Fleischer | 2017-08-10 15:15:54 +0200 |
commit | 3d33b46df24d4dee140d0aafb1eba5fffa314cf0 (patch) | |
tree | 86086c5ca8dfe17322ced822e7c313fd09337824 /ui-blob.c | |
parent | 7ce19ba550ff0d32359b9fb35eeb6282747524b9 (diff) | |
download | cgit-3d33b46df24d4dee140d0aafb1eba5fffa314cf0.tar.gz cgit-3d33b46df24d4dee140d0aafb1eba5fffa314cf0.tar.bz2 cgit-3d33b46df24d4dee140d0aafb1eba5fffa314cf0.zip |
git: update to v2.13.4
Update to git version v2.13.4: With commit 8aee769f (pathspec: copy and free
owned memory) the definition of struct pathspec_item has changed with the
expectation that pathspecs will be managed dynamically. We work around this
a bit by setting up a static structure, but let's allocate the match string
to avoid needing to cast away const.
Updated a patch from John Keeping <john@keeping.me.uk> for git v2.12.1.
Diffstat (limited to 'ui-blob.c')
-rw-r--r-- | ui-blob.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -38,7 +38,7 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only) | |||
38 | struct object_id oid; | 38 | struct object_id oid; |
39 | unsigned long size; | 39 | unsigned long size; |
40 | struct pathspec_item path_items = { | 40 | struct pathspec_item path_items = { |
41 | .match = path, | 41 | .match = xstrdup(path), |
42 | .len = strlen(path) | 42 | .len = strlen(path) |
43 | }; | 43 | }; |
44 | struct pathspec paths = { | 44 | struct pathspec paths = { |
@@ -53,10 +53,13 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only) | |||
53 | }; | 53 | }; |
54 | 54 | ||
55 | if (get_oid(ref, &oid)) | 55 | if (get_oid(ref, &oid)) |
56 | return 0; | 56 | goto done; |
57 | if (sha1_object_info(oid.hash, &size) != OBJ_COMMIT) | 57 | if (sha1_object_info(oid.hash, &size) != OBJ_COMMIT) |
58 | return 0; | 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.hash)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); |
60 | |||
61 | done: | ||
62 | free(path_items.match); | ||
60 | return walk_tree_ctx.found_path; | 63 | return walk_tree_ctx.found_path; |
61 | } | 64 | } |
62 | 65 | ||