Re: [PATCH 0/2] rebase --root: fix `reword` on a root commit
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 18, 2018, 19:25 UTC
- Message-ID
- <xmqq8t7byk19.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20180618164140.GN11827@zaya.teonanacatl.net>
Todd Zullinger <tmz@pobox.com> writes:
Show 18 quoted lines
>> 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.