From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 01 Aug 2016 09:35:55 GMT
Subject: Re: [PATCH v5 14/16] merge-recursive: offer an option to retain the output in 'obuf'
Message-ID: <alpine.DEB.2.20.1608011135010.149069@virtualbox>
In-Reply-To: <xmqqd1lyvim4.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Wed, 27 Jul 2016, Junio C Hamano wrote:

> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> 
> > diff --git a/merge-recursive.h b/merge-recursive.h
> > index d415724..340704c 100644
> > --- a/merge-recursive.h
> > +++ b/merge-recursive.h
> > @@ -13,7 +13,7 @@ struct merge_options {
> >  		MERGE_RECURSIVE_THEIRS
> >  	} recursive_variant;
> >  	const char *subtree_shift;
> > -	unsigned buffer_output : 1;
> > +	unsigned buffer_output : 2; /* 1: output at end, 2: keep buffered */
> >  	unsigned renormalize : 1;
> 
> Once a field ceases to be a boolean, it is OK not to squish it into
> a bitfield like this for a struct that we will have only a very
> small number of instances of.  Treating it just like "verbosity",
> which occupies a whole int even though it can only get up to 5 or
> so, would be more appropriate.

I changed it to an int.

Thanks,
Dscho