diff options
| author | Jeff King <peff@peff.net> | 2023-09-14 05:40:04 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-14 12:01:29 -0700 |
| commit | 6eb0c0eb7ac23da7d3bc437b7a5c31f628c25531 (patch) | |
| tree | f82c79e57d14efba0e38d14f1ab90eb54ec58c59 /merge-recursive.c | |
| parent | merge-ort: drop unused parameters from detect_and_process_renames() (diff) | |
| download | git-6eb0c0eb7ac23da7d3bc437b7a5c31f628c25531.tar.gz git-6eb0c0eb7ac23da7d3bc437b7a5c31f628c25531.zip | |
merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()
The merge_options parameter has never been used since the function was
introduced in 64aceb6d73 (merge-ort: add code to check for whether
cached renames can be reused, 2021-05-20). In theory some merge options
might impact our decisions here, but that has never been the case so
far.
Let's drop it to appease -Wunused-parameter; it would be easy to add
back later if we need to (there is only one caller).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions