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

Re: [PATCH] sequencer: detect author name errors in read_author_script()

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 3, 2022, 18:07 UTC
Message-ID
<xmqq35c4u6fp.fsf@gitster.g>
In-Reply-To
<YzsdRuD2CdJFdNVG@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
Jeff King <peff@peff.net> writes:
Show 16 quoted lines
> On Mon, Oct 03, 2022 at 04:45:06AM -0400, Jeff King wrote:
>
>> > I haven't been able to actually trigger the bug, but strongly suspect
>> > I'm just not familiar enough with how rebasing works under the covers.
>> 
>> It's a little tricky, because we avoid writing and reading the
>> author-script file unless necessary. An easy way to need it is to break
>> with a conflict (which writes it), and then resume with "git rebase
>> --continue" (which reads it back while committing).
>> 
>> Here's a patch to fix it. Thanks for your report!
>
> And here's a v2 based on the feedback received. The one-liner fix is the
> same, but it tries to be a little less clever when constructing the
> tests and has 200% more typo fixes in the commit message. Thanks Phillip
> and Ævar for review.

The create-conflict & try-resolve pair does make it easier to see what goes on in these tests.

Will queue.
Thanks.  
Previous: Jeff King
Message 11 of 11 in “Bug Report: Duplicate condition in read_author_script (sequencer.c)”
  1. Michael V. ScovettaOct 3, 2022
  2. sequencer: detect author name errors in read_author_script()Jeff King, Oct 3, 2022
  3. Phillip WoodOct 3, 2022
  4. Jeff KingOct 3, 2022
  5. Ævar Arnfjörð BjarmasonOct 3, 2022
  6. Jeff KingOct 3, 2022
  7. Jeff KingOct 3, 2022
  8. Junio C HamanoOct 3, 2022
  9. Junio C HamanoOct 3, 2022
  10. Jeff KingOct 3, 2022
  11. Junio C HamanoOct 3, 2022

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.