From: Junio C Hamano <gitster@pobox.com>
To: Todd Zullinger <tmz@pobox.com>
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH 0/2] rebase --root: fix `reword` on a root commit
Date: Mon, 18 Jun 2018 09:21:14 -0700 [thread overview]
Message-ID: <xmqqd0woxdz9.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180616201143.GH11827@zaya.teonanacatl.net> (Todd Zullinger's message of "Sat, 16 Jun 2018 16:11:43 -0400")
Todd Zullinger <tmz@pobox.com> writes:
> Hi Johannes,
>
> Johannes Schindelin via GitGitGadget wrote:
>> From: GitGitGadget <gitgitgadget@gmail.com>
>>
>> Todd Zullinger reported this bug in
>> https://public-inbox.org/git/20180615043111.GS3094@zaya.teonanacatl.net/:
>> when calling git rebase --root and trying to reword the
>> root commit's message, a BUG is reported.
>>
>> This fixes that.
>>
>> IMO the bug fix is trivial enough to qualify for inclusion into v2.18.0, still.
>
> It does indeed fix the issue. I agree it would be nice to
> see it in 2.18.0. As a fix for a minor regression
> introduced in this cycle, that seems reasonable.
Offhand it is not clear from the proposed log message where the
original breakage happened, but if this is to fix a regression
between v2.17.0 and v2.18.0, then let's have it. As -rc2 slipped
for a few days, it is reasonable to delay the final by a couple of
days as well, if only to give the last minute fixes and translators
reasonable time to breathe.
Thanks.
>
>> Johannes Schindelin (1):
>> rebase --root: fix amending root commit messages
>>
>> Todd Zullinger (1):
>> rebase --root: demonstrate a bug while amending root commit messages
>>
>> sequencer.c | 2 +-
>> t/t3404-rebase-interactive.sh | 9 +++++++++
>> 2 files changed, 10 insertions(+), 1 deletion(-)
>>
>>
>> base-commit: 68372c88794aba15f853542008cda39def768372
next prev parent reply other threads:[~2018-06-18 16:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-16 19:26 [PATCH 0/2] rebase --root: fix `reword` on a root commit Johannes Schindelin via GitGitGadget
2018-06-15 4:31 ` [PATCH 1/2] rebase --root: demonstrate a bug while amending root commit messages Johannes Schindelin via GitGitGadget
2018-06-18 10:25 ` [PATCH 1/2] rebase --root: demonstrate a bug while amending rootcommit messages Phillip Wood
2018-06-18 16:49 ` Todd Zullinger
2018-06-18 21:46 ` Johannes Schindelin
2018-06-18 22:19 ` [PATCH] t3404: check root commit in 'rebase -i --root reword root commit' Todd Zullinger
2018-06-19 6:54 ` Johannes Schindelin
2018-06-19 16:00 ` Junio C Hamano
2018-06-19 19:12 ` Todd Zullinger
2018-06-20 11:03 ` Johannes Schindelin
2018-06-19 16:21 ` Junio C Hamano
2018-06-20 11:04 ` Johannes Schindelin
2018-06-16 19:00 ` [PATCH 2/2] rebase --root: fix amending root commit messages Johannes Schindelin via GitGitGadget
2018-06-16 20:11 ` [PATCH 0/2] rebase --root: fix `reword` on a root commit Todd Zullinger
2018-06-18 16:21 ` Junio C Hamano [this message]
2018-06-18 16:41 ` Todd Zullinger
2018-06-18 19:25 ` Junio C Hamano
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=xmqqd0woxdz9.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=tmz@pobox.com \
/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).