List for cgit developers and users
 help / color / mirror / Atom feed
From: list at eworm.de (Christian Hesse)
Subject: [PATCH 1/1] RFC: git: update to v2.25.0-rc0
Date: Thu, 26 Dec 2019 00:05:46 +0100	[thread overview]
Message-ID: <20191225230546.179482-1-list@eworm.de> (raw)

From: Christian Hesse <mail at eworm.de>

Update to git version v2.25.0-rc0.

Upstream renamed 'init_display_notes()' to 'load_display_notes()' in
commit 1e6ed5441a61b5085978e0429691e2e2425f6846 ("notes: rename to
load_display_notes()").

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile | 4 ++--
 cgit.c   | 2 +-
 git      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9dada6b..ef53186 100644
--- 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.rc0
+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 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..99c33be 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 53a06cf39b756eddfe4a2a34da93e3d04eb7b728
+Subproject commit 99c33bed562b41de6ce9bd3fd561303d39645048


             reply	other threads:[~2019-12-25 23:05 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-25 23:05 list [this message]
2020-01-03  8:19 ` [PATCH 1/1] RFC: git: update to v2.25.0-rc1 list
2020-01-09  7:22   ` [PATCH 1/1] RFC: git: update to v2.25.0-rc2 list

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191225230546.179482-1-list@eworm.de \
    --to=cgit@lists.zx2c4.com \
    --subject='Re: [PATCH 1/1] RFC: git: update to v2.25.0-rc0' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).