Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Apr 24, 2018, 08:22 UTC
Message-ID: <nycvar.QRO.7.76.6.1804241015470.64@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
In-Reply-To: <cover.1524545557.git.martin.agren@gmail.com>

Hi Martin,

On Tue, 24 Apr 2018, Martin Ågren wrote:

Show 10 quoted lines

> On 23 April 2018 at 17:54, Phillip Wood <phillip.wood@talktalk.net> wrote:
> > I'm fine with leaving it, I've might get round to doing a small series to
> > clean things up slightly in a few weeks. At the moment
> > setup_unpack_trees_porcelain() leaks memory as it is called for each merge
> > and allocates new strings each time. It would also be nice if the error
> > messages reflected the command, so it said 'cherry-pick', 'revert' or
> > 'reset' rather than 'merge'
> 
> This is a small patch series to introduce and use
> `clear_unpack_trees_porcelain()`.

Great. Now I have no excuse but must change the sequencer code to output "reset" instead of "merge" ;-)

Seriously speaking again: thank you for those patches. This is truly exciting! I mean, we all touch the same code and move it forward, and somehow it all works out.

Ciao, Dscho