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>

diff --git a/Makefile b/Makefile
index b0de0ee78ad3bfbc580b9f93fc5c2cd84b42e37b..036a8e9799a02d0fa18264f9b2eb24c47dfa54dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
 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
 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 f788fd2b52031288aa1635d7283f20359d46cfdb..dbc461f2f269468e02922769e5a341b112168438 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -6,7 +6,6 @@
 #include <git-compat-util.h>
 
 #include <archive.h>
 #include <git-compat-util.h>
 
 #include <archive.h>

-#include <cache.h>

 #include <commit.h>
 #include <diffcore.h>
 #include <diff.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 <object.h>
 #include <object-name.h>
 #include <object-store.h>

+#include <path.h>

 #include <refs.h>
 #include <revision.h>
 #include <setup.h>
 #include <refs.h>
 #include <revision.h>
 #include <setup.h>

diff --git a/git b/git
index fe86abd7511a9a6862d5706c6fa1d9b57a63ba09..43c8a30d150ecede9709c1f2527c8fba92c65f40 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit fe86abd7511a9a6862d5706c6fa1d9b57a63ba09
+Subproject commit 43c8a30d150ecede9709c1f2527c8fba92c65f40

diff --git a/scan-tree.c b/scan-tree.c
index 6a2f65a86b2cda7826df470836f9757ba86abf98..84da86ef5533b5f1fdfc9e7e41d548459cc1deeb 100644 (file)
--- 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);
 }
 
        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;
 
 {
        const char *name;