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

Re: [PATCH] xdiff: implement a zealous diff3

From
Jeff King <peff@peff.net>
Date
Jun 14, 2021, 04:44 UTC
Message-ID
<YMbexfeUG78yBix4@coredump.intra.peff.net>
In-Reply-To
<60c647c1d9b5c_41f452089@natae.notmuch>
On Sun, Jun 13, 2021 at 01:00:33PM -0500, Felipe Contreras wrote:
Show 7 quoted lines
> > > I'm re-sending this patch from 2013 because I do think it provides value
> > > and we might want to make it the default.
> > 
> > I take it you didn't investigate the segfault I mentioned.
> 
> I don't know how I was supposed to investigate the few segfaults you
> mentioned. All you said is that you never tracked the bug.

My point is that if you are going to repost a patch that has known problems, it is worth saying so to give reviewers and the maintainer a realistic idea of how stable it is.

I also didn't have a reproduction recipe. I found the commit I sent by just re-running every merge in git.git in a loop.

It sounds like you have a smaller reproduction and maybe a fix, which is good.

-Peff
Previous: Elijah NewrenNext: Felipe Contreras
Message 11 of 14 in “xdiff: implement a zealous diff3”
  1. xdiff: implement a zealous diff3Felipe Contreras, Jun 13, 2021
  2. Jeff KingJun 13, 2021
  3. Felipe ContrerasJun 13, 2021
  4. Felipe ContrerasJun 13, 2021
  5. Junio C HamanoJun 15, 2021
  6. Elijah NewrenJun 15, 2021
  7. Junio C HamanoJun 15, 2021
  8. Felipe ContrerasJun 15, 2021
  9. Felipe ContrerasJun 15, 2021
  10. Elijah NewrenJun 15, 2021
  11. Jeff KingJun 14, 2021
  12. Felipe ContrerasJun 15, 2021
  13. Jeff KingJun 15, 2021
  14. Felipe ContrerasJun 15, 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.