aboutsummaryrefslogtreecommitdiff
path: root/scan-tree.c
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2023-08-09 01:45:58 +0200
committerChristian Hesse <mail@eworm.de>2023-08-15 22:28:39 +0200
commitdc2238209b9baabb278418162ad772196d01af4b (patch)
tree403989d5f044754a3ddebb5d76802d0f23871c9d /scan-tree.c
parenta6da40bf84527cbe77d1ec504e1fefb982b9a52a (diff)
downloadcgit-ch/git-2-42.tar.gz
cgit-ch/git-2-42.zip
RFC: git: update to v2.42.0-rc2ch/git-2-42
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@eworm.de>
Diffstat (limited to 'scan-tree.c')
-rw-r--r--scan-tree.c2
1 files changed, 1 insertions, 1 deletions
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;