From bd68c98879ecc8ce9f7f6d3e01bc4ffeb9182b04 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 26 Dec 2019 00:02:23 +0100 Subject: git: update to v2.25.0 Update to git version v2.25.0. Upstream renamed 'init_display_notes()' to 'load_display_notes()' in commit 1e6ed5441a61b5085978e0429691e2e2425f6846 ("notes: rename to load_display_notes()"). Signed-off-by: Christian Hesse --- Makefile | 2 +- cgit.c | 2 +- git | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9dada6b..c970429 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.24.1 +GIT_VER = 2.25.0 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r diff --git a/cgit.c b/cgit.c index ac8c641..c4320f0 100644 --- a/cgit.c +++ b/cgit.c @@ -579,7 +579,7 @@ static void prepare_repo_env(int *nongit) * load local configuration from the git repository, so we do them both while * the HOME variables are unset. */ setup_git_directory_gently(nongit); - init_display_notes(NULL); + load_display_notes(NULL); } static int prepare_repo_cmd(int nongit) diff --git a/git b/git index 53a06cf..d0654dc 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 53a06cf39b756eddfe4a2a34da93e3d04eb7b728 +Subproject commit d0654dc308b0ba76dd8ed7bbb33c8d8f7aacd783 -- cgit v1.2.3-57-g22cb