aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2023-08-09 01:45:58 +0200
committerChristian Hesse <mail@eworm.de>2023-08-21 20:56:40 +0200
commit2f50b47c72cbc4270bbd12ae7f520486d5f42736 (patch)
tree9dd3acdd2e991114ba87b5826ad5b9581579a3a7
parenta6da40bf84527cbe77d1ec504e1fefb982b9a52a (diff)
downloadcgit-2f50b47c72cbc4270bbd12ae7f520486d5f42736.tar.gz
cgit-2f50b47c72cbc4270bbd12ae7f520486d5f42736.tar.bz2
cgit-2f50b47c72cbc4270bbd12ae7f520486d5f42736.zip
git: update to v2.42.0
Update to git version v2.42.0, 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--Makefile2
-rw-r--r--cgit.h2
m---------git0
-rw-r--r--scan-tree.c2
4 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b0de0ee..036a8e9 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.41.0
+GIT_VER = 2.42.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.h b/cgit.h
index f788fd2..dbc461f 100644
--- a/cgit.h
+++ b/cgit.h
@@ -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 43c8a30d150ecede9709c1f2527c8fba92c65f4
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;