aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--cgit.c2
m---------git0
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 9d39bf4..a14477a 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.rc1
+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
-Subproject 94f057755b7941b321fd11fec1b2e3ca5313a4e
+Subproject 4621f8ce5e9b97aa2e8d0d9ffe9d25df2471074