From 555ff1c8a4fc3bf4beab0b5bb8774fd607f95111 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 19 Aug 2022 06:08:49 -0400 Subject: mark unused read_tree_recursive() callback parameters We pass a callback to read_tree_recursive(), but not every callback needs every parameter. Let's mark the unused ones to satisfy -Wunused-parameter. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'merge-recursive.c') diff --git a/merge-recursive.c b/merge-recursive.c index 775ebe2182..08c1c36d33 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -456,7 +456,7 @@ static void unpack_trees_finish(struct merge_options *opt) clear_unpack_trees_porcelain(&opt->priv->unpack_opts); } -static int save_files_dirs(const struct object_id *oid, +static int save_files_dirs(const struct object_id *UNUSED(oid), struct strbuf *base, const char *path, unsigned int mode, void *context) { -- cgit v1.2.3