Subject: Re: [PATCH 2/3] Teach 'git remote' that the config var branch.*.rebase can be 'interactive'

From: Matthieu Moy <[email-masked]>
Date: Wed, 13 Jan 2016 10:42:45 +0100

Johannes Schindelin <[email-masked]> writes:

> Signed-off-by: Johannes Schindelin <[email-masked]>
> ---
>  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;
> +			else if (!strcmp(value, "interactive"))
> +				info->rebase = INTERACTIVE_REBASE;

What happens if one has branch.*.rebase=interactive, and wants to make
an exception? Does

  git pull --rebase=true

cancel the 'interactive' part? I guess it is, but if so I think it
should be tested and documented.

Anyway, thanks for the patch.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/