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