diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-12-26 11:42:04 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-26 11:42:05 +0900 |
| commit | 179547932fb8484a5ab532ef1b56ed8b01946ab5 (patch) | |
| tree | 3970dc42db5735f61611a5c3bd9f0f1d60e0c7a4 /builtin/merge.c | |
| parent | c099531b001146662263869f7092d8598792dc27 (diff) | |
| parent | c25d9e529d531adf0697e0c09ba292227c835164 (diff) | |
| download | git-179547932fb8484a5ab532ef1b56ed8b01946ab5.tar.gz | |
Merge branch 'jk/unused-post-2.39'
Code clean-up around unused function parameters.
* jk/unused-post-2.39:
userdiff: mark unused parameter in internal callback
list-objects-filter: mark unused parameters in virtual functions
diff: mark unused parameters in callbacks
xdiff: mark unused parameter in xdl_call_hunk_func()
xdiff: drop unused parameter in def_ff()
ws: drop unused parameter from ws_blank_line()
list-objects: drop process_gitlink() function
blob: drop unused parts of parse_blob_buffer()
ls-refs: use repository parameter to iterate refs
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index ecccd5e911..0f093f2a4f 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -776,7 +776,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, } static void count_diff_files(struct diff_queue_struct *q, - struct diff_options *opt, void *data) + struct diff_options *opt UNUSED, void *data) { int *count = data; |