git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 4/4] merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()

From
Jeff King <peff@peff.net>
Date
Sep 16, 2023, 05:52 UTC
Message-ID
<20230916055207.GE13092@coredump.intra.peff.net>
In-Reply-To
<CABPp-BEi1CSXEE=-dDi_bhtSsGeVWtivfT-jQP+hjWdv4agq=Q@mail.gmail.com>
On Fri, Sep 15, 2023 at 08:09:00PM -0700, Elijah Newren wrote:
Show 13 quoted lines
> On Thu, Sep 14, 2023 at 2:40 AM Jeff King <peff@peff.net> 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
Previous: Elijah NewrenNext: Elijah Newren
Message 10 of 15 in “merge-ort unused parameter cleanups”
  1. 0/4 merge-ort unused parameter cleanupsJeff King, Sep 14, 2023
  2. 1/4 merge-ort: drop custom err() functionJeff King, Sep 14, 2023
  3. Elijah NewrenSep 16, 2023
  4. Jeff KingSep 16, 2023
  5. 2/4 merge-ort: stop passing "opt" to read_oid_strbuf()Jeff King, Sep 14, 2023
  6. 3/4 merge-ort: drop unused parameters from detect_and_process_renames()Jeff King, Sep 14, 2023
  7. Elijah NewrenSep 16, 2023
  8. 4/4 merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()Jeff King, Sep 14, 2023
  9. Elijah NewrenSep 16, 2023
  10. Jeff KingSep 16, 2023
  11. Elijah NewrenSep 16, 2023
  12. 5/4 merge-ort: lowercase a few error messagesJeff King, Sep 16, 2023
  13. Jeff KingSep 16, 2023
  14. Junio C HamanoSep 16, 2023
  15. Jeff KingSep 16, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.