about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorChristian Hesse2019-10-23 23:21:54 +0200
committerChristian Hesse2019-11-08 22:55:58 +0100
commitbfabd4519c80f39eedba3dd5d522563899e364c9 (patch)
tree5dd97c88d323f7852cb278806ba80b9395519da2
parentgit: update to v2.23.0 (diff)
downloadcgit-bfabd4519c80f39eedba3dd5d522563899e364c9.tar.gz
cgit-bfabd4519c80f39eedba3dd5d522563899e364c9.zip
git: update to v2.24.0
Update to git version v2.24.0.

Never use get_cached_commit_buffer() directly, use repo_get_commit_buffer()
instead. The latter calls the former anyway. This fixes segmentation fault
when commit-graph is enabled and get_cached_commit_buffer() does not return
the expected result.

Signed-off-by: Christian Hesse <mail@eworm.de>
-rw-r--r--Makefile2
m---------git0
-rw-r--r--parsing.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile index 96ad7cd..8a29dd9 100644 --- a/Makefile +++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
14pdfdir = $(docdir) 14pdfdir = $(docdir)
15mandir = $(prefix)/share/man 15mandir = $(prefix)/share/man
16SHA1_HEADER = <openssl/sha.h> 16SHA1_HEADER = <openssl/sha.h>
17GIT_VER = 2.23.0 17GIT_VER = 2.24.0
18GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz 18GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
19INSTALL = install 19INSTALL = install
20COPYTREE = cp -r 20COPYTREE = cp -r
diff --git a/git b/git
Subproject 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d Subproject da72936f544fec5a335e66432610e4cef443099
diff --git a/parsing.c b/parsing.c index 7b3980e..93b4767 100644 --- a/parsing.c +++ b/parsing.c
@@ -129,7 +129,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
129{ 129{
130 const int sha1hex_len = 40; 130 const int sha1hex_len = 40;
131 struct commitinfo *ret; 131 struct commitinfo *ret;
132 const char *p = get_cached_commit_buffer(the_repository, commit, NULL); 132 const char *p = repo_get_commit_buffer(the_repository, commit, NULL);
133 const char *t; 133 const char *t;
134 134
135 ret = xcalloc(1, sizeof(struct commitinfo)); 135 ret = xcalloc(1, sizeof(struct commitinfo));