Re: What's cooking in git.git (Apr 2018, #04; Mon, 30)

From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Apr 30, 2018, 15:33 UTC
Message-ID: <CAM0VKjmkn7eyooKheOEQnS=6HMZSTbhejoxQdKB7W+n=7D5KuQ@mail.gmail.com>
In-Reply-To: <xmqq4ljtz87g.fsf@gitster-ct.c.googlers.com>

On Mon, Apr 30, 2018 at 5:25 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 5 quoted lines

> * js/rebase-i-clean-msg-after-fixup-continue (2018-04-30) 4 commits
>   - rebase --skip: clean up commit message after a failed fixup/squash
>   - sequencer: always commit without editing when asked for
>   - rebase -i: Handle "combination of <n> commits" with GETTEXT_POISON
>   - rebase -i: demonstrate bugs with fixup!/squash! commit messages

>   "git rebase -i" sometimes left intermediate "# This is a
>   combination of N commits" message meant for the human consumption
>   inside an editor in the final result in certain corner cases, which
>   has been fixed.

>   Will merge to 'next'.

This topic branches off from v2.16.3. However, its last patch uses the sequencer's parse_head() function, which was only added in v2.17.0-rc0~110^2~6 (sequencer: try to commit without forking 'git commit', 2017-11-24), in topic 'pw/sequencer-in-process-commit', leading to compilation errors.