Re: [PATCH 0/2] rebase --root: fix `reword` on a root commit
Todd Zullinger writes:
>> 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.
>
> Perhaps replacing the first paragraph with this would make
> it clearer?
>
> Since 21d0764c82 ("rebase -i --root: let the sequencer handle even the
> initial part", 2018-05-04), when splitting a repository, running `git
> rebase -i --root` to reword the initial commit, Git dies with
>
> Alternately, a similar note could be added at the end.
>
> This regression was recently introduced in 21d0764c82 ("rebase -i
> --root: let the sequencer handle even the initial part", 2018-05-04).
These certainly are ways to require one less hop to the readers than
the original ;-) Having said that, I've already merged it down to
'next' and want to have these in 'master' before final, so no need
to further fix-up the log message anymore.
Thanks.
Re: [PATCH 0/2] rebase --root: fix `reword` on a root commit
Hi,
Junio C Hamano wrote:
> Todd Zullinger writes:
>
>> Hi Johannes,
>>
>> Johannes Schindelin via GitGitGadget wrote:
>>> From: GitGitGadget
>>>
>>> Todd Zullinger reported this bug in
>>> https://public-inbox.org/git/20180615043111.gs3...@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.
Perhaps replacing the first paragraph with this would make
it clearer?
Since 21d0764c82 ("rebase -i --root: let the sequencer handle even the
initial part", 2018-05-04), when splitting a repository, running `git
rebase -i --root` to reword the initial commit, Git dies with
Alternately, a similar note could be added at the end.
This regression was recently introduced in 21d0764c82 ("rebase -i
--root: let the sequencer handle even the initial part", 2018-05-04).
--
Todd
Re: [PATCH 0/2] rebase --root: fix `reword` on a root commit
Todd Zullinger writes: > Hi Johannes, > > Johannes Schindelin via GitGitGadget wrote: >> From: GitGitGadget >> >> Todd Zullinger reported this bug in >> https://public-inbox.org/git/20180615043111.gs3...@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
Re: [PATCH 0/2] rebase --root: fix `reword` on a root commit
Hi Johannes, Johannes Schindelin via GitGitGadget wrote: > From: GitGitGadget > > Todd Zullinger reported this bug in > https://public-inbox.org/git/20180615043111.gs3...@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. > 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 -- Todd ~~ I don't mean to sound cold, or cruel, or vicious, but I am, so that's the way it comes out. -- Bill Hicks
