4 files changed, 3 insertions, 2 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 = <openssl/sha.h>
-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
-Subproject 94f057755b7941b321fd11fec1b2e3ca5313a4e
+Subproject e9019fcafe0040228b8631c30f97ae1adb61bcd
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.