RFC: git: update to v2.25.0-rc1

Update to git version v2.25.0-rc1.

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>

diff --git a/Makefile b/Makefile
index 9dada6b8edb3fa572b8ad3fb2d746bd77fc9f243..d0d0dd8adfeaa9e6b34c0c4c5d8d286513bb1ee6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.24.1
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
+GIT_VER = 2.25.0.rc1
+GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
 MAN5_TXT = $(wildcard *.5.txt)

diff --git a/cgit.c b/cgit.c
index ac8c6418ba46061da375fe26c82b39d1be6e51fc..c4320f044d4bae6df164719432c650b028bd4419 100644 (file)
--- 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 53a06cf39b756eddfe4a2a34da93e3d04eb7b728..8679ef24ed64018bb62170c43ce73e0261c0600a 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 53a06cf39b756eddfe4a2a34da93e3d04eb7b728
+Subproject commit 8679ef24ed64018bb62170c43ce73e0261c0600a