[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