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

Re: [PATCH 0/2] fix union merge with binary files

From
Elijah Newren <newren@gmail.com>
Date
Jun 10, 2021, 15:19 UTC
Message-ID
<CABPp-BGEJ7TX9G_kdZt3ZqhhFMe9-8KHdSJ8bJ+avtsXdnUUnw@mail.gmail.com>
In-Reply-To
<YMIKwsEFnkqz6PWa@coredump.intra.peff.net>
On Thu, Jun 10, 2021 at 5:54 AM Jeff King <peff@peff.net> wrote:
Show 7 quoted lines
>
> This started as an attempt to silence a "gcc -O3" warning. But I was
> curious if we could trigger the problem it complains about in practice
> (spoiler: we can), so I wrote a test. And it seems there was an even
> bigger bug lurking, where we'd generate bogus merge results. :)
>
> This fixes both bugs.

Nice catches, and fixes. I had a minor comment on 2/2, but with or without fixing up the 'path_unused' variable name both patches are:

Reviewed-by: Elijah Newren <newren@gmail.com>
Previous: Jeff King
Message 7 of 7 in “fix union merge with binary files”
  1. 0/2 fix union merge with binary filesJeff King, Jun 10, 2021
  2. 1/2 ll_binary_merge(): handle XDL_MERGE_FAVOR_UNIONJeff King, Jun 10, 2021
  3. Junio C HamanoJun 11, 2021
  4. 2/2 ll_union_merge(): pass name labels to ll_xdl_merge()Jeff King, Jun 10, 2021
  5. Elijah NewrenJun 10, 2021
  6. 3/2 ll_union_merge(): rename path_unused parameterJeff King, Jun 10, 2021
  7. Elijah NewrenJun 10, 2021

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.