* [PATCH 1/1] git: update to v2.42.0
@ 2023-08-21 18:56 Christian Hesse
2023-08-21 21:06 ` Christian Hesse
0 siblings, 1 reply; 2+ messages in thread
From: Christian Hesse @ 2023-08-21 18:56 UTC (permalink / raw)
To: cgit; +Cc: Christian Hesse
From: Christian Hesse <mail@eworm.de>
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>
---
Makefile | 2 +-
cgit.h | 2 +-
git | 2 +-
scan-tree.c | 2 +-
4 files changed, 4 insertions(+), 4 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
index fe86abd..43c8a30 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit fe86abd7511a9a6862d5706c6fa1d9b57a63ba09
+Subproject commit 43c8a30d150ecede9709c1f2527c8fba92c65f40
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;
--
2.41.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] git: update to v2.42.0
2023-08-21 18:56 [PATCH 1/1] git: update to v2.42.0 Christian Hesse
@ 2023-08-21 21:06 ` Christian Hesse
0 siblings, 0 replies; 2+ messages in thread
From: Christian Hesse @ 2023-08-21 21:06 UTC (permalink / raw)
To: cgit; +Cc: Christian Hesse
[-- Attachment #1: Type: text/plain, Size: 581 bytes --]
Christian Hesse <list@eworm.de> on Mon, 2023/08/21 20:56:
> From: Christian Hesse <mail@eworm.de>
>
> Update to git version v2.42.0, this requires changes for these
> upstream commits:
And just another request to fast-forwarded this into master.
We have a lot of breaking changes here...
Also tagging a release may be reasonable...
--
main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH"
"CX:;",b;for(a/* Best regards my address: */=0;b=c[a++];)
putchar(b-1/(/* Chris cc -ox -xc - && ./x */b/42*2-3)*42);}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-21 21:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-21 18:56 [PATCH 1/1] git: update to v2.42.0 Christian Hesse
2023-08-21 21:06 ` Christian Hesse
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).