{"thread":{"id":"35493","subject":"[PATCH] remote: fix status with branch...rebase=preserve","startedAt":"2013-12-07T13:08:37Z","lastAt":"2013-12-09T21:18:52Z","messageCount":3,"participants":["Felipe Contreras","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"231700","messageId":"1386421717-27698-1-git-send-email-felipe.contreras@gmail.com","threadId":"35493","inReplyTo":null,"subject":"[PATCH] remote: fix status with branch...rebase=preserve","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-12-07T13:08:37Z","receivedAt":"2013-12-07T13:08:37Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Commit 66713ef (pull: allow pull to preserve merges when rebasing)\ndidn't include an update so 'git remote status' parses branch.<name>.rebase=preserve\ncorrectly, let's do that.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n builtin/remote.c | 9 +++++++--\n 1 file changed, 7 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/remote.c b/builtin/remote.c\nindex 4e14891..5e4ab66 100644\n--- a/builtin/remote.c\n+++ b/builtin/remote.c\n@@ -309,8 +309,13 @@ static int config_read_branches(const char *key, const char *value, void *cb)\n \t\t\t\tspace = strchr(value, ' ');\n \t\t\t}\n \t\t\tstring_list_append(&info->merge, xstrdup(value));\n-\t\t} else\n-\t\t\tinfo->rebase = git_config_bool(orig_key, value);\n+\t\t} else {\n+\t\t\tint v = git_config_maybe_bool(orig_key, value);\n+\t\t\tif (v >= 0)\n+\t\t\t\tinfo->rebase = v;\n+\t\t\telse if (!strcmp(value, \"preserve\"))\n+\t\t\t\tinfo->rebase = 1;\n+\t\t}\n \t}\n \treturn 0;\n }\n-- \n1.8.4.2+fc1\n"},{"id":"231823","messageId":"xmqqmwk9wwql.fsf@gitster.dls.corp.google.com","threadId":"35493","inReplyTo":"1386421717-27698-1-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH] remote: fix status with branch...rebase=preserve","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-12-09T21:16:50Z","receivedAt":"2013-12-09T21:16:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Felipe Contreras <felipe.contreras@gmail.com> writes:\n\n> Commit 66713ef (pull: allow pull to preserve merges when rebasing)\n> didn't include an update so 'git remote status' parses branch.<name>.rebase=preserve\n> correctly, let's do that.\n>\n> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n> ---\n>  builtin/remote.c | 9 +++++++--\n>  1 file changed, 7 insertions(+), 2 deletions(-)\n>\n> diff --git a/builtin/remote.c b/builtin/remote.c\n> index 4e14891..5e4ab66 100644\n> --- a/builtin/remote.c\n> +++ b/builtin/remote.c\n> @@ -309,8 +309,13 @@ static int config_read_branches(const char *key, const char *value, void *cb)\n>  \t\t\t\tspace = strchr(value, ' ');\n>  \t\t\t}\n>  \t\t\tstring_list_append(&info->merge, xstrdup(value));\n> -\t\t} else\n> -\t\t\tinfo->rebase = git_config_bool(orig_key, value);\n> +\t\t} else {\n> +\t\t\tint v = git_config_maybe_bool(orig_key, value);\n> +\t\t\tif (v >= 0)\n> +\t\t\t\tinfo->rebase = v;\n> +\t\t\telse if (!strcmp(value, \"preserve\"))\n> +\t\t\t\tinfo->rebase = 1;\n> +\t\t}\n\nLooks correct.  Do we want to add a test?\n\n>  \t}\n>  \treturn 0;\n>  }\n"},{"id":"231825","messageId":"xmqqiouxwwn7.fsf@gitster.dls.corp.google.com","threadId":"35493","inReplyTo":"1386421717-27698-1-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH] remote: fix status with branch...rebase=preserve","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-12-09T21:18:52Z","receivedAt":"2013-12-09T21:18:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks, will queue.\n"}]}