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

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

From
Jeff King <peff@peff.net>
Date
Jun 10, 2021, 12:51 UTC
Message-ID
<YMIKwsEFnkqz6PWa@coredump.intra.peff.net>

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.
  [1/2]: ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION
  [2/2]: ll_union_merge(): pass name labels to ll_xdl_merge()
 ll-merge.c            |  6 ++++--
 t/t6406-merge-attr.sh | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
-Peff
Next: Jeff King
Message 1 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.