* [PATCH] remote: fix status with branch...rebase=preserve
@ 2013-12-07 13:08 Felipe Contreras
2013-12-09 21:16 ` Junio C Hamano
2013-12-09 21:18 ` Junio C Hamano
0 siblings, 2 replies; 3+ messages in thread
From: Felipe Contreras @ 2013-12-07 13:08 UTC (permalink / raw)
To: git; +Cc: Stephen Haberman, Julian Phillips, Jay Soffian, Felipe Contreras
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>
---
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;
+ }
}
return 0;
}
--
1.8.4.2+fc1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] remote: fix status with branch...rebase=preserve
2013-12-07 13:08 [PATCH] remote: fix status with branch...rebase=preserve Felipe Contreras
@ 2013-12-09 21:16 ` Junio C Hamano
2013-12-09 21:18 ` Junio C Hamano
1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2013-12-09 21:16 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git, Stephen Haberman, Julian Phillips, Jay Soffian
Felipe Contreras <felipe.contreras@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.contreras@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;
> }
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] remote: fix status with branch...rebase=preserve
2013-12-07 13:08 [PATCH] remote: fix status with branch...rebase=preserve Felipe Contreras
2013-12-09 21:16 ` Junio C Hamano
@ 2013-12-09 21:18 ` Junio C Hamano
1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2013-12-09 21:18 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git, Stephen Haberman, Julian Phillips, Jay Soffian
Thanks, will queue.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-09 21:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-07 13:08 [PATCH] remote: fix status with branch...rebase=preserve Felipe Contreras
2013-12-09 21:16 ` Junio C Hamano
2013-12-09 21:18 ` Junio C Hamano
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.