git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: "Michael V. Scovetta" <michael.scovetta@gmail.com>,
	"Phillip Wood" <phillip.wood@dunelm.org.uk>,
	git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH] sequencer: detect author name errors in read_author_script()
Date: Mon, 03 Oct 2022 11:07:38 -0700	[thread overview]
Message-ID: <xmqq35c4u6fp.fsf@gitster.g> (raw)
In-Reply-To: <YzsdRuD2CdJFdNVG@coredump.intra.peff.net> (Jeff King's message of "Mon, 3 Oct 2022 13:35:02 -0400")

Jeff King <peff@peff.net> writes:

Jeff King <peff@peff.net> writes:

> 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.  

      reply	other threads:[~2022-10-03 18:07 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-03  6:39 Bug Report: Duplicate condition in read_author_script (sequencer.c) Michael V. Scovetta
2022-10-03  8:45 ` [PATCH] sequencer: detect author name errors in read_author_script() Jeff King
2022-10-03  9:29   ` Phillip Wood
2022-10-03 17:15     ` Jeff King
2022-10-03  9:40   ` Ævar Arnfjörð Bjarmason
2022-10-03 17:27     ` Jeff King
2022-10-03 17:39       ` Jeff King
2022-10-03 18:05         ` Junio C Hamano
2022-10-03 16:34   ` Junio C Hamano
2022-10-03 17:35   ` Jeff King
2022-10-03 18:07     ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq35c4u6fp.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=michael.scovetta@gmail.com \
    --cc=peff@peff.net \
    --cc=phillip.wood@dunelm.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).