{"thread":{"id":"52342","subject":"[PATCH] fmt-merge-msg: use skip_prefix() instead of starts_with()","startedAt":"2019-11-26T14:23:18Z","lastAt":"2019-11-26T16:10:56Z","messageCount":2,"participants":["René Scharfe","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"387081","messageId":"8fa33928-3cbc-beba-524b-55bca143fd80@web.de","threadId":"52342","inReplyTo":null,"subject":"[PATCH] fmt-merge-msg: use skip_prefix() instead of starts_with()","fromName":"René Scharfe","fromEmail":"l.s.r@web.de","sentAt":"2019-11-26T14:22:56Z","receivedAt":"2019-11-26T14:23:18Z","isPatch":true,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"Get rid of two magic numbers by using skip_prefix().\n\nSigned-off-by: René Scharfe <l.s.r@web.de>\n---\n builtin/fmt-merge-msg.c | 9 ++++-----\n 1 file changed, 4 insertions(+), 5 deletions(-)\n\ndiff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c\nindex a4615587fd..736f666f64 100644\n--- a/builtin/fmt-merge-msg.c\n+++ b/builtin/fmt-merge-msg.c\n@@ -106,7 +106,7 @@ static int handle_line(char *line, struct merge_parents *merge_parents)\n \tint i, len = strlen(line);\n \tstruct origin_data *origin_data;\n \tchar *src;\n-\tconst char *origin;\n+\tconst char *origin, *tag_name;\n \tstruct src_data *src_data;\n \tstruct string_list_item *item;\n \tint pulling_head = 0;\n@@ -162,14 +162,13 @@ static int handle_line(char *line, struct merge_parents *merge_parents)\n \tif (pulling_head) {\n \t\torigin = src;\n \t\tsrc_data->head_status |= 1;\n-\t} else if (starts_with(line, \"branch \")) {\n+\t} else if (skip_prefix(line, \"branch \", &origin)) {\n \t\torigin_data->is_local_branch = 1;\n-\t\torigin = line + 7;\n \t\tstring_list_append(&src_data->branch, origin);\n \t\tsrc_data->head_status |= 2;\n-\t} else if (starts_with(line, \"tag \")) {\n+\t} else if (skip_prefix(line, \"tag \", &tag_name)) {\n \t\torigin = line;\n-\t\tstring_list_append(&src_data->tag, origin + 4);\n+\t\tstring_list_append(&src_data->tag, tag_name);\n \t\tsrc_data->head_status |= 2;\n \t} else if (skip_prefix(line, \"remote-tracking branch \", &origin)) {\n \t\tstring_list_append(&src_data->r_branch, origin);\n--\n2.24.0\n"},{"id":"387092","messageId":"20191126161053.GE25729@sigill.intra.peff.net","threadId":"52342","inReplyTo":"8fa33928-3cbc-beba-524b-55bca143fd80@web.de","subject":"Re: [PATCH] fmt-merge-msg: use skip_prefix() instead of starts_with()","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-11-26T16:10:53Z","receivedAt":"2019-11-26T16:10:56Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Nov 26, 2019 at 03:22:56PM +0100, René Scharfe wrote:\n\n> diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c\n> index a4615587fd..736f666f64 100644\n> --- a/builtin/fmt-merge-msg.c\n> +++ b/builtin/fmt-merge-msg.c\n> @@ -106,7 +106,7 @@ static int handle_line(char *line, struct merge_parents *merge_parents)\n>  \tint i, len = strlen(line);\n>  \tstruct origin_data *origin_data;\n>  \tchar *src;\n> -\tconst char *origin;\n> +\tconst char *origin, *tag_name;\n>  \tstruct src_data *src_data;\n>  \tstruct string_list_item *item;\n>  \tint pulling_head = 0;\n> @@ -162,14 +162,13 @@ static int handle_line(char *line, struct merge_parents *merge_parents)\n>  \tif (pulling_head) {\n>  \t\torigin = src;\n>  \t\tsrc_data->head_status |= 1;\n> -\t} else if (starts_with(line, \"branch \")) {\n> +\t} else if (skip_prefix(line, \"branch \", &origin)) {\n>  \t\torigin_data->is_local_branch = 1;\n> -\t\torigin = line + 7;\n>  \t\tstring_list_append(&src_data->branch, origin);\n>  \t\tsrc_data->head_status |= 2;\n> -\t} else if (starts_with(line, \"tag \")) {\n> +\t} else if (skip_prefix(line, \"tag \", &tag_name)) {\n>  \t\torigin = line;\n> -\t\tstring_list_append(&src_data->tag, origin + 4);\n> +\t\tstring_list_append(&src_data->tag, tag_name);\n>  \t\tsrc_data->head_status |= 2;\n\nLooks good, as we're already mutating \"origin\" in the first one, and\n\"tag_name\" is a new variable in the second one.\n\n-Peff\n"}]}