diff options
| author | Christian Hesse <mail@eworm.de> | 2019-12-26 00:02:23 +0100 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2020-01-09 08:16:47 +0100 |
| commit | c832c5a96494a2ef0f739217c59c0f060508123c (patch) | |
| tree | a8e737efcd301c2835bc9e2cf24a1669e9132a4f | |
| parent | 260b2caa6f5b169f287322ac0a2c442059ebf179 (diff) | |
| download | cgit-ch/git-2-25-0.tar.gz | |
RFC: git: update to v2.25.0-rc2ch/git-2-25-0
Update to git version v2.25.0-rc2.
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>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | cgit.c | 2 | ||||
| m--------- | git | 0 |
3 files changed, 3 insertions, 3 deletions
@@ -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.rc2 +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) @@ -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 -Subproject 53a06cf39b756eddfe4a2a34da93e3d04eb7b72 +Subproject 7a6a90c6ec48fc78c83d7090d6c1b95d8f3739c |