From 932dc064573a62e195956881f9a5282192ba9525 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 17 Jun 2026 21:44:45 +0200 Subject: git: update to v2.55.0 Update to git version v2.55.0, this requires a change for this upstream commit: * a80a8e3ea6a070185840219778df24db832899f6 setup: stop using `the_repository` in `setup_git_directory_gently()` * ffe8005b9d8e0cf1b5d5d796ca4da76fbe219011 t: detect errors outside of test cases Signed-off-by: Christian Hesse --- Makefile | 2 +- cgit.c | 2 +- git | 2 +- tests/setup.sh | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9d39bf4..d039293 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.54.0 +GIT_VER = 2.55.0 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r 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..e9019fc 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 94f057755b7941b321fd11fec1b2e3ca5313a4e0 +Subproject commit e9019fcafe0040228b8631c30f97ae1adb61bcdc diff --git a/tests/setup.sh b/tests/setup.sh index 8db810f..f1beef9 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -45,6 +45,7 @@ IFS=$OLDIFS : ${TEST_DIRECTORY=$(pwd)/../git/t} : ${TEST_OUTPUT_DIRECTORY=$(pwd)} TEST_NO_CREATE_REPO=YesPlease +GIT_TEST_USE_SET_E=false . "$TEST_DIRECTORY"/test-lib.sh # Prepend the directory containing cgit to PATH. -- cgit v1.2.3