mirror/zx2c4.cgit
1
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2025-08-15 23:17:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

git: update to v2.13.4

Browse source 
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.
This commit is contained in:
Christian Hesse 2017-07-24 17:22:52 +02:00 • committed by Lukas Fleischer
parent 7ce19ba550
commit 3d33b46df2
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ui-blob.c
View file

@ -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;
}