On Fri, Sep 15, 2023 at 08:09:00PM -0700, Elijah Newren wrote: > On Thu, Sep 14, 2023 at 2:40 AM Jeff King <peff@xxxxxxxx> wrote: > > > > 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. > > Yeah, it was used in some preliminary versions of the code while I was > developing the new algorithm, but there were lots of changes between > when I started working on merge-ort and when it was finally ready to > submit for review. I must have just overlooked that this parameter > was no longer needed. Thanks for catching and cleaning up. Yeah, that's what I figured. I actually queued quite a few of these -Wunused-parameter fixups, because the initial iterations of merge-ort had a lot of stub functions or unimplemented bits. I sat on them for a year or so because I figured you'd eventually use those parameters. And indeed, most of them fell out naturally, and what was left for this series was all pretty easy to understand. -Peff
