From: Phillip Wood <phillip.wood123@gmail.com>
To: Jeff King <peff@peff.net>,
Jonas Kittner <jonas.kittner@ruhr-uni-bochum.de>
Cc: Phillip Wood <phillip.wood@dunelm.org.uk>, git@vger.kernel.org
Subject: Re: `BUG: sequencer.c:921: GIT_AUTHOR_DATE missing from author script` when trying to reword in interactive rebase
Date: Tue, 2 Nov 2021 12:20:35 +0000 [thread overview]
Message-ID: <c510fd61-a079-c8fd-9203-61706f5534ac@gmail.com> (raw)
In-Reply-To: <YYCT7tLfphH049h+@coredump.intra.peff.net>
On 02/11/2021 01:27, Jeff King wrote:
> On Tue, Nov 02, 2021 at 12:17:29AM +0100, Jonas Kittner wrote:
>
>> In the interactive prompt I changed `pick` to `reword`, saved and closed the
>> prompt.
>> Commands to repoduce see below
>
> Thanks for the easy reproduction. Here are commands that slightly
> simplify / automate things, which I used to bisect:
>
> rm -rf repo
> git init repo
> cd repo
> git commit --allow-empty -qm base
>
> touch file
> git add .
> GIT_AUTHOR_DATE='@123456789 +0000' git commit -qm "this message says pick"
>
> GIT_EDITOR='sed -i s/pick/reword/' \
> git.compile rebase -i --committer-date-is-author-date HEAD^
>
> # not strictly necessary, but when it works, you can see that the
> # timestamps correctly match, and that "pick" was changed to "reword"
> # in the message. Of course when it doesn't work, rebase aborts, so
> # that's easier to see than looking at the commit. :)
> git cat-file commit HEAD
>
>> What happened instead? (Actual behavior)
>> segfault: `BUG: sequencer.c:921: GIT_AUTHOR_DATE missing from author script`
>>
>> [...]
>>
>> https://github.com/git/git/commit/7573cec52c0274ceb166c425be4288f6b3103d6f#d
>> iff-0e574dc9087fc7831bbc1403545a8561f08869576c1ccc4146aa276146ff9777R888-R88
>> 9
>> this seems to be not the case and needs to be handled differently I guess?
>
> It looks like things did work back in 7573cec52c (rebase -i: support
> --committer-date-is-author-date, 2020-08-17). Bisecting shows that it
> broke in baf8ec8d3a (rebase -r: don't write .git/MERGE_MSG when
> fast-forwarding, 2021-08-20). +cc Phillip (who wrote both commits).
Thanks for bisecting, I think I know what the problem is, I'll post a
fix tomorrow.
Best Wishes
Phillip
prev parent reply other threads:[~2021-11-02 12:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-01 23:17 `BUG: sequencer.c:921: GIT_AUTHOR_DATE missing from author script` when trying to reword in interactive rebase Jonas Kittner
2021-11-02 1:27 ` Jeff King
2021-11-02 12:20 ` Phillip Wood [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c510fd61-a079-c8fd-9203-61706f5534ac@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonas.kittner@ruhr-uni-bochum.de \
--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.
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 NNTP newsgroup(s).