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

Re: What's cooking in git.git (Sep 2018, #04; Thu, 20)

From
Jeff King <peff@peff.net>
Date
Oct 1, 2018, 20:12 UTC
Message-ID
<20181001201202.GA10234@sigill.intra.peff.net>
In-Reply-To
<c5f7009b-53b5-26b9-8a01-b8648ee33a15@web.de>
On Mon, Oct 01, 2018 at 09:16:07PM +0200, René Scharfe wrote:
Show 15 quoted lines
> Am 21.09.2018 um 07:22 schrieb Junio C Hamano:
> > * cc/delta-islands (2018-08-16) 7 commits
> [...]
> > * jk/pack-delta-reuse-with-bitmap (2018-08-21) 6 commits
>
> Not sure if it's the interaction of the two topics or if only one of
> them is to blame, but the result of the merge can dereference a NULL
> pointer.  Found using Clang's UBSan and t5310.
> 
> Here's a patch that avoids the issue, but I don't know if it's the
> right thing to do -- should we rather treat a non-existing base as
> "not from the same island" instead?
> 
> And it's certainly ugly -- that condition is complicated enough
> already.  Splitting it up in a nice way would probably help, but how?

Perhaps like in 2fa233a554 (pack-objects: handle island check for "external" delta base, 2018-09-18)?

-Peff
Previous: René ScharfeNext: René Scharfe
Message 14 of 15 in “What's cooking in git.git (Sep 2018, #04; Thu, 20)”
  1. Junio C HamanoSep 21, 2018
  2. Segfault in master due to 4fbcca4effÆvar Arnfjörð Bjarmason, Sep 21, 2018
  3. Derrick StoleeSep 21, 2018
  4. Ævar Arnfjörð BjarmasonSep 21, 2018
  5. Derrick StoleeSep 21, 2018
  6. Junio C HamanoSep 21, 2018
  7. Ævar Arnfjörð BjarmasonSep 21, 2018
  8. Jeff KingSep 21, 2018
  9. Ævar Arnfjörð BjarmasonSep 21, 2018
  10. Johannes SixtSep 21, 2018
  11. Junio C HamanoSep 21, 2018
  12. Paul-Sebastian UngureanuSep 23, 2018
  13. René ScharfeOct 1, 2018
  14. Jeff KingOct 1, 2018
  15. René ScharfeOct 1, 2018

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.