From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 27 Apr 2016 06:46:38 GMT
Subject: Re: [PATCH 1/2] merge: do not contaminate option_commit with --squash
Message-ID: <alpine.DEB.2.20.1604270846200.2896@virtualbox>
In-Reply-To: <xmqqk2jkdpjr.fsf_-_@gitster.mtv.corp.google.com>

Hi Junio,

On Tue, 26 Apr 2016, Junio C Hamano wrote:

> It is true that we do not make a commit when we are asked to do
> "merge --squash", and the code does so by setting option_commit
> variable to zero when seeing the squash option.  But this made it
> impossible to see from the value of option_commit if --no-commit was
> given from the command line, or --squash turned it off.
> 
> We check for the value of option_commit at only two places.  Check
> for the value of squash at them, too.
> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> 
>  * Just a preliminary clean-up for the next one which is on topic.

I think it would make for a nice cleanup anyways.

Ciao,
Dscho