Diff options
| -rw-r--r-- | Makefile | 14 | |
| -rw-r--r-- | source/cgit.c | 2 | |
| m--------- | vendor/git | 0 |
3 files changed, 12 insertions, 4 deletions
@@ -17,7 +17,7 @@ CGIT_ROOT = ../.. # Git release fetched by get-git when the submodule is not checked out. Keep in # step with the submodule pin in .gitmodules. -GIT_VERSION = 2.54.0 +GIT_VERSION = 2.55.0 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VERSION).tar.xz # Compiled-in cgit defaults, overridable through cgit.conf. All carry the CGIT_ @@ -67,13 +67,21 @@ all: cgit # cgit is compiled inside the bundled Git tree so it can reuse Git's build # machinery (see source/cgit.mk). Objects and the binary go to build/. +# +# NO_RUST keeps Cargo out of the build. Git 2.55 inverted the flag that used +# to be WITH_RUST, so Rust is now compiled in unless it is turned off, and +# leaving this out would quietly make Cargo a build requirement. Git 3.0 drops +# the choice entirely, at which point this stops working and Rust becomes +# mandatory. +GIT_BUILD_FLAGS = NO_CURL=1 NO_OPENSSL=1 NO_RUST=1 + cgit: +@$(MAKE) -C $(GITDIR) -f $(CGIT_ROOT)/$(SRCDIR)/cgit.mk \ - $(CGIT_ROOT)/$(BUILDDIR)/cgit $(EXTRA_GIT_TARGETS) NO_CURL=1 NO_OPENSSL=1 + $(CGIT_ROOT)/$(BUILDDIR)/cgit $(EXTRA_GIT_TARGETS) $(GIT_BUILD_FLAGS) sparse: +@$(MAKE) -C $(GITDIR) -f $(CGIT_ROOT)/$(SRCDIR)/cgit.mk \ - NO_CURL=1 NO_OPENSSL=1 cgit-sparse + $(GIT_BUILD_FLAGS) cgit-sparse test: cgit-with-git +@$(MAKE) -C tests all diff --git a/source/cgit.c b/source/cgit.c index 1ab77a4..f58aab3 100644 --- a/source/cgit.c +++ b/source/cgit.c @@ -612,7 +612,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/vendor/git b/vendor/git -Subproject 94f057755b7941b321fd11fec1b2e3ca5313a4e0 +Subproject e9019fcafe0040228b8631c30f97ae1adb61bcdc |