From 237c0eb415c632ec3480d890084c3d815298ac1f Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 17 Sep 2023 17:52:32 +0300
Subject: chore(3p/sources): bump channels and overlays (2023-09-17)

* 3p/cgit: import fixes for git v2.42.0

  Upstream patch: https://git.zx2c4.com/cgit/patch/?id=2f50b47c72cbc4270bbd12ae7f520486d5f42736

Change-Id: I7549f909b145becaccb983936dc5c3e17941122b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9353
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Tested-by: BuildkiteCI
Autosubmit: tazjin <tazjin@tvl.su>
---
 third_party/cgit/cgit.h      | 2 +-
 third_party/cgit/scan-tree.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'third_party/cgit')

diff --git a/third_party/cgit/cgit.h b/third_party/cgit/cgit.h
index a284af9aedec..f201f82b855f 100644
--- a/third_party/cgit/cgit.h
+++ b/third_party/cgit/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/third_party/cgit/scan-tree.c b/third_party/cgit/scan-tree.c
index 1e3b43debf5b..aa9366542694 100644
--- a/third_party/cgit/scan-tree.c
+++ b/third_party/cgit/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;
 
-- 
cgit 1.4.1