diff options
| author | Christian Hesse <mail@eworm.de> | 2023-08-09 01:45:58 +0200 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2023-08-15 22:28:39 +0200 |
| commit | dc2238209b9baabb278418162ad772196d01af4b (patch) | |
| tree | 403989d5f044754a3ddebb5d76802d0f23871c9d | |
| parent | a6da40bf84527cbe77d1ec504e1fefb982b9a52a (diff) | |
| download | cgit-ch/git-2-42.tar.gz cgit-ch/git-2-42.zip | |
RFC: git: update to v2.42.0-rc2ch/git-2-42
Update to git version v2.42.0-rc2, this requires changes for these
upstream commits:
* bc5c5ec0446895f5c4139cd470066beb3c4ac6d5
cache.h: remove this no-longer-used header
* aba070683295a20bdf4f49146384984961c794b2
path: move related function to path
* a4e7e317f8f27f861321e6eb08b9c8c0f3ab570c
config: add ctx arg to config_fn_t
Signed-off-by: Christian Hesse <mail@eworm.de>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | cgit.h | 2 | ||||
| m--------- | git | 0 | ||||
| -rw-r--r-- | scan-tree.c | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = <openssl/sha.h> -GIT_VER = 2.41.0 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.42.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) @@ -6,7 +6,6 @@ #include <git-compat-util.h> #include <archive.h> -#include <cache.h> #include <commit.h> #include <diffcore.h> #include <diff.h> @@ -19,6 +18,7 @@ #include <object.h> #include <object-name.h> #include <object-store.h> +#include <path.h> #include <refs.h> #include <revision.h> #include <setup.h> diff --git a/git b/git -Subproject fe86abd7511a9a6862d5706c6fa1d9b57a63ba0 +Subproject f1ed9d7dc0e49dc1a044941d821c9d2342313c2 diff --git a/scan-tree.c b/scan-tree.c index 6a2f65a..84da86e 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -54,7 +54,7 @@ static void scan_tree_repo_config(const char *name, const char *value) config_fn(repo, name, value); } -static int gitconfig_config(const char *key, const char *value, void *cb) +static int gitconfig_config(const char *key, const char *value, const struct config_context *, void *cb) { const char *name; |