Felipe Contreras <felipe.contre...@gmail.com> writes:

> Commit 66713ef (pull: allow pull to preserve merges when rebasing)
> didn't include an update so 'git remote status' parses 
> branch.<name>.rebase=preserve
> correctly, let's do that.
>
> Signed-off-by: Felipe Contreras <felipe.contre...@gmail.com>
> ---
>  builtin/remote.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/remote.c b/builtin/remote.c
> index 4e14891..5e4ab66 100644
> --- a/builtin/remote.c
> +++ b/builtin/remote.c
> @@ -309,8 +309,13 @@ static int config_read_branches(const char *key, const 
> char *value, void *cb)
>                               space = strchr(value, ' ');
>                       }
>                       string_list_append(&info->merge, xstrdup(value));
> -             } else
> -                     info->rebase = git_config_bool(orig_key, value);
> +             } else {
> +                     int v = git_config_maybe_bool(orig_key, value);
> +                     if (v >= 0)
> +                             info->rebase = v;
> +                     else if (!strcmp(value, "preserve"))
> +                             info->rebase = 1;
> +             }

Looks correct.  Do we want to add a test?

>       }
>       return 0;
>  }
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to