From list at eworm.de  Tue Aug 15 16:48:14 2023
From: list at eworm.de (Christian Hesse)
Date: Tue, 15 Aug 2023 18:48:14 +0200
Subject: [PATCH 1/1] RFC: git: update to v2.42.0-rc1
Message-ID: <20230815164814.205151-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

Update to git version v2.42.0-rc1, 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 at eworm.de>
---
 Makefile    | 4 ++--
 cgit.h      | 2 +-
 git         | 2 +-
 scan-tree.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index b0de0ee..3c3cb21 100644
--- a/Makefile
+++ b/Makefile
@@ -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.rc1
+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)
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..fac96df 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit fe86abd7511a9a6862d5706c6fa1d9b57a63ba09
+Subproject commit fac96dfbb1c24369ba7d37a5affd8adfe6c650fd
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


From list at eworm.de  Tue Aug 15 20:29:24 2023
From: list at eworm.de (Christian Hesse)
Date: Tue, 15 Aug 2023 22:29:24 +0200
Subject: [PATCH 1/1] RFC: git: update to v2.42.0-rc2
Message-ID: <20230815202924.20034-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

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 at eworm.de>
---
 Makefile    | 4 ++--
 cgit.h      | 2 +-
 git         | 2 +-
 scan-tree.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index b0de0ee..974d9ba 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
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..f1ed9d7 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit fe86abd7511a9a6862d5706c6fa1d9b57a63ba09
+Subproject commit f1ed9d7dc0e49dc1a044941d821c9d2342313c26
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


From list at eworm.de  Mon Aug 21 18:56:59 2023
From: list at eworm.de (Christian Hesse)
Date: Mon, 21 Aug 2023 20:56:59 +0200
Subject: [PATCH 1/1] git: update to v2.42.0
Message-ID: <20230821185659.12878-1-list@eworm.de>

From: Christian Hesse <mail at 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 at 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


From list at eworm.de  Mon Aug 21 21:06:28 2023
From: list at eworm.de (Christian Hesse)
Date: Mon, 21 Aug 2023 23:06:28 +0200
Subject: [PATCH 1/1] git: update to v2.42.0
In-Reply-To: <20230821185659.12878-1-list@eworm.de>
References: <20230821185659.12878-1-list@eworm.de>
Message-ID: <20230821230628.60771136@leda.eworm.net>

Christian Hesse <list at eworm.de> on Mon, 2023/08/21 20:56:
> From: Christian Hesse <mail at 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);}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20230821/1a0ef9a3/attachment.sig>

From martin at ashbysoft.com  Mon Aug 28 07:39:14 2023
From: martin at ashbysoft.com (Martin Ashby)
Date: Mon, 28 Aug 2023 08:39:14 +0100
Subject: [PATCH] ui-snapshot: Remove charset from content-type header
Message-ID: <20230828073945.311406-1-martin@ashbysoft.com>

The charset is only applicable for text type media types, which
snapshots are not. Including the charset in non-text media types also
breaks some client software.

Signed-off-by: Martin Ashby <martin at ashbysoft.com>
---
 ui-snapshot.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 18361a6..9eb1ed7 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -169,6 +169,8 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
 	ctx.page.etag = oid_to_hex(&oid);
 	ctx.page.mimetype = xstrdup(format->mimetype);
 	ctx.page.filename = xstrdup(filename);
+	// A charset parameter isn't applicable for binary downloads
+	ctx.page.charset = NULL;
 	cgit_print_http_headers();
 	init_archivers();
 	format->write_func(hex, prefix);
-- 
2.41.0