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>
This commit is contained in:
Christian Hesse 2019-12-26 00:02:23 +01:00 committed by Jason A. Donenfeld
parent ca98c9e7bf
commit bd68c98879
3 changed files with 3 additions and 3 deletions

View File

@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir) pdfdir = $(docdir)
mandir = $(prefix)/share/man mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h> 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 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
INSTALL = install INSTALL = install
COPYTREE = cp -r COPYTREE = cp -r

2
cgit.c
View File

@ -579,7 +579,7 @@ static void prepare_repo_env(int *nongit)
* load local configuration from the git repository, so we do them both while * load local configuration from the git repository, so we do them both while
* the HOME variables are unset. */ * the HOME variables are unset. */
setup_git_directory_gently(nongit); setup_git_directory_gently(nongit);
init_display_notes(NULL); load_display_notes(NULL);
} }
static int prepare_repo_cmd(int nongit) static int prepare_repo_cmd(int nongit)

2
git

@ -1 +1 @@
Subproject commit 53a06cf39b756eddfe4a2a34da93e3d04eb7b728 Subproject commit d0654dc308b0ba76dd8ed7bbb33c8d8f7aacd783