From: Christian Hesse <[email protected]> Update to git version v2.55.0-rc2, this requires a change for this upstream commit:
* a80a8e3ea6a070185840219778df24db832899f6 setup: stop using `the_repository` in `setup_git_directory_gently()` Signed-off-by: Christian Hesse <[email protected]> --- Makefile | 4 ++-- cgit.c | 2 +- git | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9d39bf4..7a85ebb 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.54.0 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.55.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) diff --git a/cgit.c b/cgit.c index ca318e8..3b9d3aa 100644 --- a/cgit.c +++ b/cgit.c @@ -588,7 +588,7 @@ static void prepare_repo_env(int *nongit) /* 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); + setup_git_directory_gently(the_repository, nongit); load_display_notes(NULL); } diff --git a/git b/git index 94f0577..ab776a6 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 94f057755b7941b321fd11fec1b2e3ca5313a4e0 +Subproject commit ab776a62a78576513ee121424adb19597fbb7613
