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

Re: [PATCH] diff: check for merge bases before assigning sym->base

From
Chris Torek <chris.torek@gmail.com>
Date
Jul 8, 2020, 17:05 UTC
Message-ID
<CAPx1GvfLpTR-weVQcWm5iX59cmCh2Gad+vU=ESqqLkCq-O5RmA@mail.gmail.com>
In-Reply-To
<20200708043819.GA2303891@coredump.intra.peff.net>
On Tue, Jul 7, 2020 at 9:38 PM Jeff King <peff@peff.net> wrote:
> I suspect the solution is [to call die one line earlier]:
Oops, yes.
> I don't see anything within this function guaranteeing that rpos is set,
> either, though I suspect it is OK due to how the revision parser works.

Yes, I am depending on the revision parser to balance the left and right items. I thought about having a BUG check but it seemed unnecessary. On the other hand, I'm avoiding depending on its *placement* of left and right items. Being more defensive might be good here.

(I had a version of this that also implemented Junio's suggestion of not first marking all bases, then unmarking the chosen base, but in the end it came out to the same amount of code. I could resurrect that if anyone cares.)

Chris
Previous: Jeff KingNext: Jeff King
Message 3 of 4 in “t4068 test failure with -fsanitize=address”
  1. brian m. carlsonJul 7, 2020
  2. diff: check for merge bases before assigning sym->baseJeff King, Jul 8, 2020
  3. Chris TorekJul 8, 2020
  4. Jeff KingJul 9, 2020

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.