[PATCH v2 1/1] git: update to v2.24.0

Christian Hesse list at eworm.de
Fri Nov 8 22:58:04 CET 2019


From: Christian Hesse <mail at eworm.de>

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 at eworm.de>
---
 Makefile  | 2 +-
 git       | 2 +-
 parsing.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 96ad7cd..8a29dd9 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.23.0
+GIT_VER = 2.24.0
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/git b/git
index 5fa0f52..da72936 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9
+Subproject commit da72936f544fec5a335e66432610e4cef4430991
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)
 {
 	const int sha1hex_len = 40;
 	struct commitinfo *ret;
-	const char *p = get_cached_commit_buffer(the_repository, commit, NULL);
+	const char *p = repo_get_commit_buffer(the_repository, commit, NULL);
 	const char *t;
 
 	ret = xcalloc(1, sizeof(struct commitinfo));


More information about the CGit mailing list