mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-08 09:38:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir) pdfdir = $(docdir)
mandir = $(prefix)/share/man mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h> SHA1_HEADER = <openssl/sha.h>
GIT_VER = 2.11.0 GIT_VER = 2.13.4
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
INSTALL = install INSTALL = install
COPYTREE = cp -r COPYTREE = cp -r

2
git

@ -1 +1 @@
Subproject commit 454cb6bd52a4de614a3633e4f547af03d5c3b640 Subproject commit cf8899d285d2648013040ec7196ffd3de0606664

4
shared.c
View File

@ -352,7 +352,7 @@ void cgit_diff_tree(const struct object_id *old_oid,
opt.format_callback = cgit_diff_tree_cb; opt.format_callback = cgit_diff_tree_cb;
opt.format_callback_data = fn; opt.format_callback_data = fn;
if (prefix) { if (prefix) {
item.match = prefix; item.match = xstrdup(prefix);
item.len = strlen(prefix); item.len = strlen(prefix);
opt.pathspec.nr = 1; opt.pathspec.nr = 1;
opt.pathspec.items = &item; opt.pathspec.items = &item;
@ -365,6 +365,8 @@ void cgit_diff_tree(const struct object_id *old_oid,
diff_root_tree_sha1(new_oid->hash, "", &opt); diff_root_tree_sha1(new_oid->hash, "", &opt);
diffcore_std(&opt); diffcore_std(&opt);
diff_flush(&opt); diff_flush(&opt);
free(item.match);
} }
void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix) void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)

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; struct object_id oid;
unsigned long size; unsigned long size;
struct pathspec_item path_items = { struct pathspec_item path_items = {
.match = path, .match = xstrdup(path),
.len = strlen(path) .len = strlen(path)
}; };
struct pathspec paths = { 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)) if (get_oid(ref, &oid))
return 0; goto done;
if (sha1_object_info(oid.hash, &size) != OBJ_COMMIT) 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); 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; return walk_tree_ctx.found_path;
} }