Author: Christian Hesse <mail@eworm.de>
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 <mail@eworm.de>
Makefile | 2 +- cgit.c | 2 +-
diff --git a/Makefile b/Makefile index 9dada6b8edb3fa572b8ad3fb2d746bd77fc9f243..c970429d04d2802a6fd589adef4687fde0d463b4 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.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 ac8c6418ba46061da375fe26c82b39d1be6e51fc..c4320f044d4bae6df164719432c650b028bd4419 100644 --- a/cgit.c +++ b/cgit.c @@ -579,7 +579,7 @@ /* Setup the git directory and initialize the notes system. Both of these * 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)