diff options
| author | Jeff King <peff@peff.net> | 2022-08-19 13:08:49 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-19 22:18:56 +0300 |
| commit | 555ff1c8a4fc3bf4beab0b5bb8774fd607f95111 (patch) | |
| tree | eb3641aac61e98cc6644318b853e67e8d317fcdf /merge-recursive.c | |
| parent | 02c3c59e62a30771d209a171edfc75a4d7387ebe (diff) | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |