List for cgit developers and users
 help / color / mirror / Atom feed
From: list at eworm.de (Christian Hesse)
Subject: [PATCH v2 1/1] git: update to v2.24.0
Date: Fri,  8 Nov 2019 22:58:04 +0100	[thread overview]
Message-ID: <20191108215804.16931-1-list@eworm.de> (raw)
In-Reply-To: <20191108215406.4b3838a1@leda>

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));


      reply	other threads:[~2019-11-08 21:58 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-04  8:46 [PATCH " list
2019-11-08  7:58 ` list
2019-11-08  8:15   ` list
2019-11-08 20:54     ` list
2019-11-08 21:58       ` list [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191108215804.16931-1-list@eworm.de \
    --to=cgit@lists.zx2c4.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).