diff options
| author | Christian Hesse <mail@eworm.de> | 2017-07-24 17:22:52 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@lfos.de> | 2017-08-10 15:15:54 +0200 |
| commit | 3d33b46df24d4dee140d0aafb1eba5fffa314cf0 (patch) | |
| tree | 86086c5ca8dfe17322ced822e7c313fd09337824 /ui-blob.c | |
| parent | Update .mailmap with my new email address (diff) | |
| download | cgit-pink-3d33b46df24d4dee140d0aafb1eba5fffa314cf0.tar.gz cgit-pink-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
diff --git a/ui-blob.c b/ui-blob.c index 5f30de7..793817f 100644 --- a/ui-blob.c +++ b/ui-blob.c @@ -38,7 +38,7 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only) struct object_id oid; unsigned long size; struct pathspec_item path_items = { - .match = path, + .match = xstrdup(path), .len = strlen(path) }; struct pathspec paths = { @@ -53,10 +53,13 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only) }; if (get_oid(ref, &oid)) - return 0; + goto done; if (sha1_object_info(oid.hash, &size) != OBJ_COMMIT) - return 0; + goto done; read_tree_recursive(lookup_commit_reference(oid.hash)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); + +done: + free(path_items.match); return walk_tree_ctx.found_path; } |