diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-12-07 13:08:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-09 22:12:24 (GMT) |
| commit | 0a54f709057729d0aa9f1e767e4f201834f14834 (patch) | |
| tree | bac3456c4c93bdc3b5b15cd83b1c29dd1120521f | |
| parent | 379484b55155d65d9e721b48aca29f6f3d24d95e (diff) | |
| download | git-0a54f709057729d0aa9f1e767e4f201834f14834.zip git-0a54f709057729d0aa9f1e767e4f201834f14834.tar.gz git-0a54f709057729d0aa9f1e767e4f201834f14834.tar.bz2 | |
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.<name>.rebase=preserve
correctly, let's do that.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/remote.c | 9 |
1 files 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; + } } return 0; } |