Re: [PATCH v7 07/17] # This is a combination of 2 commits. # This is the 1st commit message:

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Apr 20, 2018, 08:34 UTC
Message-ID: <nycvar.QRO.7.76.6.1804201027010.4241@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
In-Reply-To: <CAPig+cRrS0_nYJJY=O6cboV630sNQHPV5QGrQdD8MW-sYzNFGQ@mail.gmail.com>

Hi Eric,

On Fri, 20 Apr 2018, Eric Sunshine wrote:

Show 5 quoted lines

> On Thu, Apr 19, 2018 at 8:20 AM, Johannes Schindelin
> <johannes.schindelin@gmx.de> wrote:
> > # This is a combination of 2 commits. # This is the 1st commit message:
> 
> Botched squash/fixup?

Sure was!

Show 14 quoted lines

> > sequencer: introduce the `merge` command
> >
> > This patch is part of the effort to reimplement `--preserve-merges` with
> > a substantially improved design, a design that has been developed in the
> > Git for Windows project to maintain the dozens of Windows-specific patch
> > series on top of upstream Git.
> > [...]
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > # The commit message #2 will be skipped:
> >
> > # fixup! sequencer: introduce the `merge` command
> 
> Bloop.

Obviously, this was not processed properly (I certainly did not have this in my editor, otherwise it would have been stripped). This is not the first time this happened. I think there is a bug in sequencer.c (i.e. in my partial reimplementation of git-rebase--interactive in C), but I do not have time right now to investigate further... Will try to find some time soon.

Or maybe I'll just install a post-rewrite hook that notifies me of this problem so that I can investigate right when it happened...

Oh scratch that. Now I am too annoyed with what I perceive a bug in *my* code. I'll hunt it down.

Thanks, Dscho