From 0a54f709057729d0aa9f1e767e4f201834f14834 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sat, 7 Dec 2013 07:08:37 -0600 Subject: remote: fix status with branch...rebase=preserve Commit 66713ef (pull: allow pull to preserve merges when rebasing) didn't include an update so 'git remote status' parses branch..rebase=preserve correctly, let's do that. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- builtin/remote.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index 4e14891095..5e4ab66c26 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; + } } return 0; } -- cgit v1.2.3