From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 13 Jan 2016 06:51:33 GMT
Subject: Re: [PATCH 2/3] Teach 'git remote' that the config var branch.*.rebase can be 'interactive'
Message-ID: <alpine.DEB.2.20.1601130751130.2964@virtualbox>
In-Reply-To: <xmqqk2nes6cc.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Tue, 12 Jan 2016, Junio C Hamano wrote:

> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> 
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> >  builtin/remote.c | 8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/builtin/remote.c b/builtin/remote.c
> > index 6694cf2..0af8300 100644
> > --- a/builtin/remote.c
> > +++ b/builtin/remote.c
> > @@ -251,7 +251,7 @@ static int add(int argc, const char **argv)
> >  struct branch_info {
> >  	char *remote_name;
> >  	struct string_list merge;
> > -	int rebase;
> > +	enum { NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE } rebase;
> >  };
> >  
> >  static struct string_list branch_list;
> > @@ -312,6 +312,8 @@ static int config_read_branches(const char *key, const char *value, void *cb)
> >  				info->rebase = v;
> >  			else if (!strcmp(value, "preserve"))
> >  				info->rebase = 1;
> 
> This should become NORMAL_REBASE, I would think, even though the
> resulting machine code should be identical.

Fixed in v2.

Thanks,
Dscho